From fe408e49068c3f33979946c08823fd5ae4589d9f Mon Sep 17 00:00:00 2001 From: gaoxq <376340421@qq.com> Date: Thu, 19 Mar 2026 21:55:47 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=E9=A1=B9=E7=9B=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/biz/bin/deploy.bat | 25 + modules/biz/bin/deploy.sh | 21 + modules/biz/bin/package.bat | 25 + modules/biz/bin/package.sh | 21 + modules/biz/db/biz.erm | 3590 +++++++++++++++++ modules/biz/pom.xml | 46 + .../main/resources/application-assistant.yml | 12 + .../src/main/resources/config/jeesite-biz.yml | 4 + .../main/resources/db/upgrade/biz/versions | 1 + modules/erp/bin/deploy.bat | 25 + modules/erp/bin/deploy.sh | 21 + modules/erp/bin/package.bat | 25 + modules/erp/bin/package.sh | 21 + modules/erp/db/erp.erm | 3590 +++++++++++++++++ modules/erp/pom.xml | 46 + .../main/resources/application-assistant.yml | 12 + .../src/main/resources/config/jeesite-erp.yml | 4 + .../main/resources/db/upgrade/erp/versions | 1 + modules/pom.xml | 76 +- web-api/pom.xml | 252 +- .../com/jeesite/modules/utils/AesUtil.java | 109 + .../com/jeesite/modules/utils/DateUtils.java | 53 + .../com/jeesite/modules/utils/KeyUtil.java | 48 + .../jeesite/modules/utils/LoggerUtils.java | 187 + .../src/main/resources/config/application.yml | 182 +- web-vue/package.json | 2 + web-vue/packages/assets/images/logo.png | Bin 7419 -> 14057 bytes web-vue/packages/assets/svg/login-box-bg.svg | 99 +- web-vue/packages/biz/README.md | 22 + web-vue/packages/biz/package.json | 30 + web-vue/packages/biz/tsconfig.json | 20 + .../components/Application/src/AppLogo.vue | 2 +- web-vue/packages/core/layouts/page/index.vue | 13 - .../core/layouts/views/login/LoginForm.vue | 9 +- .../packages/core/utils/http/axios/index.ts | 15 +- web-vue/packages/erp/README.md | 22 + web-vue/packages/erp/package.json | 30 + web-vue/packages/erp/tsconfig.json | 20 + web-vue/pnpm-lock.yaml | 31 + web-vue/web/public/favicon.png | Bin 4794 -> 4286 bytes web-vue/web/public/resource/img/logo.png | Bin 7419 -> 14057 bytes .../web/public/resource/img/pwa-192x192.png | Bin 7691 -> 54154 bytes .../web/public/resource/img/pwa-512x512.png | Bin 40792 -> 54154 bytes .../java/com/jeesite/modules/Application.java | 34 +- web/src/main/resources/config/application.yml | 182 +- 45 files changed, 8260 insertions(+), 668 deletions(-) create mode 100644 modules/biz/bin/deploy.bat create mode 100644 modules/biz/bin/deploy.sh create mode 100644 modules/biz/bin/package.bat create mode 100644 modules/biz/bin/package.sh create mode 100644 modules/biz/db/biz.erm create mode 100644 modules/biz/pom.xml create mode 100644 modules/biz/src/main/resources/application-assistant.yml create mode 100644 modules/biz/src/main/resources/config/jeesite-biz.yml create mode 100644 modules/biz/src/main/resources/db/upgrade/biz/versions create mode 100644 modules/erp/bin/deploy.bat create mode 100644 modules/erp/bin/deploy.sh create mode 100644 modules/erp/bin/package.bat create mode 100644 modules/erp/bin/package.sh create mode 100644 modules/erp/db/erp.erm create mode 100644 modules/erp/pom.xml create mode 100644 modules/erp/src/main/resources/application-assistant.yml create mode 100644 modules/erp/src/main/resources/config/jeesite-erp.yml create mode 100644 modules/erp/src/main/resources/db/upgrade/erp/versions create mode 100644 web-api/src/main/java/com/jeesite/modules/utils/AesUtil.java create mode 100644 web-api/src/main/java/com/jeesite/modules/utils/DateUtils.java create mode 100644 web-api/src/main/java/com/jeesite/modules/utils/KeyUtil.java create mode 100644 web-api/src/main/java/com/jeesite/modules/utils/LoggerUtils.java create mode 100644 web-vue/packages/biz/README.md create mode 100644 web-vue/packages/biz/package.json create mode 100644 web-vue/packages/biz/tsconfig.json create mode 100644 web-vue/packages/erp/README.md create mode 100644 web-vue/packages/erp/package.json create mode 100644 web-vue/packages/erp/tsconfig.json diff --git a/modules/biz/bin/deploy.bat b/modules/biz/bin/deploy.bat new file mode 100644 index 0000000..f1293bd --- /dev/null +++ b/modules/biz/bin/deploy.bat @@ -0,0 +1,25 @@ +@echo off +rem /** +rem * Copyright (c) 2013-Now https://jeesite.com All rights reserved. +rem * No deletion without permission, or be held responsible to law. +rem * +rem * Author: ThinkGem@163.com +rem */ +echo. +echo [信息] 部署工程到Maven服务器。 +echo. + +%~d0 +cd %~dp0 + +if defined JAVA_HOME17 ( + set "JAVA_HOME=%JAVA_HOME17%" & set "PATH=%JAVA_HOME17%\bin;%PATH%" +) +call mvn -v +echo. + +cd .. +call mvn clean deploy -Dmaven.test.skip=true -Pdeploy + +cd bin +pause \ No newline at end of file diff --git a/modules/biz/bin/deploy.sh b/modules/biz/bin/deploy.sh new file mode 100644 index 0000000..e387c2b --- /dev/null +++ b/modules/biz/bin/deploy.sh @@ -0,0 +1,21 @@ +#!/bin/sh +# /** +# * Copyright (c) 2013-Now https://jeesite.com All rights reserved. +# * No deletion without permission, or be held responsible to law. +# * +# * Author: ThinkGem@163.com +# */ +echo "" +echo "[淇℃伅] 閮ㄧ讲宸ョ▼鍒癕aven鏈嶅姟鍣ㄣ" +echo "" + +if [ -n "$JAVA_HOME17" ] && [ -d "$JAVA_HOME17" ]; then + export JAVA_HOME="$JAVA_HOME17" PATH="$JAVA_HOME/bin:$PATH" +fi +mvn -v +echo "" + +cd .. +mvn clean deploy -Dmaven.test.skip=true -Pdeploy + +cd bin \ No newline at end of file diff --git a/modules/biz/bin/package.bat b/modules/biz/bin/package.bat new file mode 100644 index 0000000..0010627 --- /dev/null +++ b/modules/biz/bin/package.bat @@ -0,0 +1,25 @@ +@echo off +rem /** +rem * Copyright (c) 2013-Now https://jeesite.com All rights reserved. +rem * No deletion without permission, or be held responsible to law. +rem * +rem * Author: ThinkGem@163.com +rem */ +echo. +echo [信息] 打包安装工程，生成jar包文件。 +echo. + +%~d0 +cd %~dp0 + +if defined JAVA_HOME17 ( + set "JAVA_HOME=%JAVA_HOME17%" & set "PATH=%JAVA_HOME17%\bin;%PATH%" +) +call mvn -v +echo. + +cd .. +call mvn clean install -Dmaven.test.skip=true -Ppackage + +cd bin +pause \ No newline at end of file diff --git a/modules/biz/bin/package.sh b/modules/biz/bin/package.sh new file mode 100644 index 0000000..2fcc785 --- /dev/null +++ b/modules/biz/bin/package.sh @@ -0,0 +1,21 @@ +#!/bin/sh +# /** +# * Copyright (c) 2013-Now https://jeesite.com All rights reserved. +# * No deletion without permission, or be held responsible to law. +# * +# * Author: ThinkGem@163.com +# */ +echo "" +echo "[淇℃伅] 鎵撳寘瀹夎宸ョ▼锛岀敓鎴恓ar鍖呮枃浠躲" +echo "" + +if [ -n "$JAVA_HOME17" ] && [ -d "$JAVA_HOME17" ]; then + export JAVA_HOME="$JAVA_HOME17" PATH="$JAVA_HOME/bin:$PATH" +fi +mvn -v +echo "" + +cd .. +mvn clean install -Dmaven.test.skip=true -Ppackage + +cd bin \ No newline at end of file diff --git a/modules/biz/db/biz.erm b/modules/biz/db/biz.erm new file mode 100644 index 0000000..c926926 --- /dev/null +++ b/modules/biz/db/biz.erm @@ -0,0 +1,3590 @@ + + + + true + 100 + A4 210 x 297 mm + 30 + 30 + 30 + 30 + + 0 + 1.0 + 0 + 0 + + 128 + 128 + 192 + + + 255 + 255 + 255 + + Arial + 14 + + StandardSQL + false + + + 0 + true + 2 + 1 + 1 + false + true + false + false + + + db/biz.sql + UTF-8 + CR+LF + false + 7be191506f9daa8070b3ac14921dffd44063d2bb + null + + true + false + true + false + true + false + false + false + false + false + false + false + false + false + false + true + false + true + false + false + + + + + null + db/biz.xls + + + en + + true + true + true + + + + true + true + true + + + db/biz.png + + true + true + + + + + + + false + + + + + 0 + + + + false + false + + + + + false + + + + + + -1 + -1 + Arial + 14 + 50 + 50 + + 255 + 255 + 255 + + + + false + 2016-12-25 17:25:00 + + Project Name + + + + Model Name + + + + Version + + + + Company + + + + Author + + + + + + + + + 7be191506f9daa8070b3ac14921dffd44063d2bb + Default + + + + + + 136ca02f1b3a96a8f2e242d5dd64d48f566143ef + 64 + null + false + null + false + false + false + + false + 绉熸埛浠ｇ爜 + 绉熸埛浠ｇ爜 + corp_code + varchar(n) + + + f116706ac00cd3a3ee88b2a88debf7ebc3eeb12d + 100 + null + false + null + false + false + false + + false + 绉熸埛鍚嶇О + 绉熸埛鍚嶇О + corp_name + nvarchar(n) + + + 1a3b3f8bccfce8894d117d6bdb0a6b104bfb80ef + 64 + null + false + null + false + false + false + + false + + 鍒涘缓鑰 + create_by + varchar(n) + + + dba1aec0c72d79ea73ed4ebde07696cf4df174b7 + null + null + false + null + false + false + false + + false + + 鍒涘缓鏃堕棿 + create_date + datetime + + + f01926071736b56b898949cc0720149c71504324 + null + null + false + null + false + false + false + + false + + 鎵╁睍 Date 1 + extend_d1 + datetime + + + 942700093ab61c3be0bdf6b23bcba210bcc30281 + null + null + false + null + false + false + false + + false + + 鎵╁睍 Date 2 + extend_d2 + datetime + + + f221902bf89fe94dece8ccf309f59cc2c479d63f + null + null + false + null + false + false + false + + false + + 鎵╁睍 Date 3 + extend_d3 + datetime + + + c8d21e24bc69aac295703b0bae56269035b729f0 + null + null + false + null + false + false + false + + false + + 鎵╁睍 Date 4 + extend_d4 + datetime + + + 4c0cc4ae32f8774cc319f516784430204aef0bdb + 19 + 4 + false + null + false + false + false + + false + + 鎵╁睍 Float 1 + extend_f1 + decimal(p,s) + + + 2e958c528620621985af4394590198feed57cdf9 + 19 + 4 + false + null + false + false + false + + false + + 鎵╁睍 Float 2 + extend_f2 + decimal(p,s) + + + 7c25ad75662553c7d4a58fa66eb50ca7c0ffee59 + 19 + 4 + false + null + false + false + false + + false + + 鎵╁睍 Float 3 + extend_f3 + decimal(p,s) + + + 1f81990c9694963f032c302d1834b972a6f2eb74 + 19 + 4 + false + null + false + false + false + + false + + 鎵╁睍 Float 4 + extend_f4 + decimal(p,s) + + + a1d747cd40768ac9f85176518ee48cb513bae110 + 19 + null + false + null + false + false + false + + false + + 鎵╁睍 Integer 1 + extend_i1 + decimal(p) + + + a9f0e14d6691c397990abe4ef1ff21674dccf401 + 19 + null + false + null + false + false + false + + false + + 鎵╁睍 Integer 2 + extend_i2 + decimal(p) + + + 2ce06c5cf87d93bb1e3f47268dbc679be4b6dd8d + 19 + null + false + null + false + false + false + + false + + 鎵╁睍 Integer 3 + extend_i3 + decimal(p) + + + 53d8c730fcec69d341f44089817ae06eb4844278 + 19 + null + false + null + false + false + false + + false + + 鎵╁睍 Integer 4 + extend_i4 + decimal(p) + + + 80cd53da9d5a1b19676537e590e20fa2793e902c + 1000 + null + false + null + false + false + false + + false + + 鎵╁睍 JSON + extend_json + varchar(n) + + + ad6f9eff50476669df62b7601cbc3a2e0c905d36 + 500 + null + false + null + false + false + false + + false + + 鎵╁睍 String 1 + extend_s1 + nvarchar(n) + + + 3a24133d2be4831e99d1319983e5393bcf964ff9 + 500 + null + false + null + false + false + false + + false + + 鎵╁睍 String 2 + extend_s2 + nvarchar(n) + + + 40e1afbbad28d28e371dd1ab77fb56640b1cb66b + 500 + null + false + null + false + false + false + + false + + 鎵╁睍 String 3 + extend_s3 + nvarchar(n) + + + a2d6b5a494fc1a3d29360d922296521c6640856b + 500 + null + false + null + false + false + false + + false + + 鎵╁睍 String 4 + extend_s4 + nvarchar(n) + + + 29f701cc6a308fbfc5b12b80fee621ceeb231dcc + 500 + null + false + null + false + false + false + + false + + 鎵╁睍 String 5 + extend_s5 + nvarchar(n) + + + c9a37a7b6a5451930ca63e36814767f742cd1393 + 500 + null + false + null + false + false + false + + false + + 鎵╁睍 String 6 + extend_s6 + nvarchar(n) + + + 8c26203d310a4e602cf0c0fc8a7b2c818219c1dc + 500 + null + false + null + false + false + false + + false + + 鎵╁睍 String 7 + extend_s7 + nvarchar(n) + + + 54448f19b0f5d1630bf29f9f99787802c36ebddb + 500 + null + false + null + false + false + false + + false + + 鎵╁睍 String 8 + extend_s8 + nvarchar(n) + + + 869fc70cf3a4e92e8056b40814df8e03f9f9efde + 64 + null + false + null + false + false + false + + false + + 缂栧彿 + id + varchar(n) + + + b18ce64a2a72d00b26515583d8bbfea282f30ea8 + 64 + null + false + null + false + false + false + + false + + 鐖剁骇缂栧彿 + parent_code + varchar(n) + + + 5887f9db78a9ebc7b23b9a163c6f68100257c0e5 + 767 + null + false + null + false + false + false + + false + + 鎵鏈夌埗绾х紪鍙 + parent_codes + varchar(n) + + + 8f7d3761c17a1b8632d186a3c67cb08dca18c498 + 500 + null + false + null + false + false + false + + false + + 澶囨敞淇℃伅 + remarks + nvarchar(n) + + + ba0fb53af3ccc8b0e5d73baa58ec27fbb7973097 + 1 + null + false + null + false + false + false + + false + + 鐘舵侊紙0姝ｅ父 1鍒犻櫎 2鍋滅敤 3鍐荤粨 4瀹℃牳 5椹冲洖 9鑽夌ǹ锛 + status + character(n) + + + 17718c2364a2368c2072da279c927d7ad3bfcf08 + 1 + null + false + null + false + false + false + + false + + 鐘舵侊紙0姝ｅ父 1鍒犻櫎 2鍋滅敤锛 + status + character(n) + + + 23b25e48c87be0e4f3952f7a8330594e9d511a4e + 64 + null + false + null + false + false + false + + false + + 鍖哄煙閫夋嫨 + test_area_code + varchar(n) + + + 8bc627205b6e55931d09079fcd07bfacbbd38f41 + 100 + null + false + null + false + false + false + + false + + 鍖哄煙鍚嶇О + test_area_name + nvarchar(n) + + + cdc46f802299958a2b3140200410caf5cbeb8a27 + 200 + null + false + null + false + false + false + + false + + 澶嶉夋 + test_checkbox + varchar(n) + + + d829e707316a49d39e5a11da5f5d36030a856b86 + 64 + null + false + null + false + false + false + + false + + 鐖惰〃涓婚敭 + test_data_id + varchar(n) + + + a27ebfd109532e2f551b101a0c78b3f50a3d58dd + null + null + false + null + false + false + false + + false + + 鏃ユ湡閫夋嫨 + test_date + datetime + + + 95ec23c1b2704817cca94d169aed5e11deb0adbb + null + null + false + null + false + false + false + + false + + 鏃ユ湡鏃堕棿 + test_datetime + datetime + + + ac02f2d1fff63fa66db583735eb1c8e9b466872f + 200 + null + false + null + false + false + false + + false + + 鍗曡鏂囨湰 + test_input + varchar(n) + + + e2270df5e0974bf471fdfe36e29bc9a8aa1774cb + 64 + null + false + null + false + false + false + + false + + 鏈烘瀯閫夋嫨 + test_office_code + varchar(n) + + + 791691b791efedc2d14867a152b4de58f4567326 + 10 + null + false + null + false + false + false + + false + + 鍗曢夋 + test_radio + varchar(n) + + + 6697b12cf2f6d7135570c2a581212ee067c13206 + 10 + null + false + null + false + false + false + + false + + 涓嬫媺妗 + test_select + varchar(n) + + + 68b9381c1fb6668186fef70f52fc0c14b1bd6f1c + 200 + null + false + null + false + false + false + + false + + 涓嬫媺澶氶 + test_select_multiple + varchar(n) + + + ae103dc1fb50094552e56afd72015481271913db + null + null + false + null + false + false + false + + false + + 鎺掑簭鍙 + test_sort + integer + + + 2fed92437d28f1427e913aba1251fe0807c7b209 + 200 + null + false + null + false + false + false + + false + + 澶氳鏂囨湰 + test_textarea + nvarchar(n) + + + 2eda719a62fb7e1d3face62555046d938abddda9 + 64 + null + false + null + false + false + false + + false + + 鐢ㄦ埛閫夋嫨 + test_user_code + varchar(n) + + + 70e9482ae432d16e734a730100e366ddab33564c + 64 + null + false + null + false + false + false + + false + + 鑺傜偣缂栫爜 + tree_code + varchar(n) + + + 40b63ab3e485fd55370d6d04b063c4397483ebc1 + 1 + null + false + null + false + false + false + + false + + 鏄惁鏈鏈骇 + tree_leaf + character(n) + + + 3b9c3307b7140f27edeb47ffe307a662b2856627 + 4 + null + false + null + false + false + false + + false + + 灞傛绾у埆 + tree_level + decimal(p) + + + 5356a60d0801c47941dd2fb4565cf785bb58e2d3 + 200 + null + false + null + false + false + false + + false + + 鑺傜偣鍚嶇О + tree_name + nvarchar(n) + + + bf5e60dee567b3ed0f12e8f3ffa1f74e43012b3a + 767 + null + false + null + false + false + false + + false + + 鍏ㄨ妭鐐瑰悕 + tree_names + varchar(n) + + + 16c9c333062ea3614d2e044803b872676c8a5377 + 10 + null + false + null + false + false + false + + false + + 鎺掑簭鍙凤紙鍗囧簭锛 + tree_sort + decimal(p) + + + a886757c87fb1e04c5f84b6a802e129baaec2ca6 + 767 + null + false + null + false + false + false + + false + + 鎵鏈夋帓搴忓彿 + tree_sorts + varchar(n) + + + 2c6b290f30c6f9e100f6c77eab0cba7bb3386768 + 64 + null + false + null + false + false + false + + false + + 鏇存柊鑰 + update_by + varchar(n) + + + f0bdbc4002f4a1b7fb7c5026bc21a7689c549728 + null + null + false + null + false + false + false + + false + + 鏇存柊鏃堕棿 + update_date + datetime + + + + + + + e553474c37270813e70025e433a4cf8a64653e13 + 438 + 387 + Arial + 14 + 864 + 36 + + 128 + 128 + 192 + + + + test_tree + 娴嬭瘯鏍戣〃 + + + + + + + 70e9482ae432d16e734a730100e366ddab33564c + 7e417ee9d0dd69c767a5853922621946ed4fb2d8 + + + + + varchar(n) + + + false + false + true + true + false + + + + + + + + + + + false + false + false + + + 0 + + + a535b6c506004a7fdf4d48984c9ff2cfa59c157a + + 5356a60d0801c47941dd2fb4565cf785bb58e2d3 + 39f501890586173d229e83610cfbfaa6e3a85374 + + + + + nvarchar(n) + + + false + false + true + false + false + + + + + + + + + + + false + false + false + + + 0 + + + 35ae805d1da92afdb99b2fe8c536d1649356fccd + + + + + + + + +
+ + 5435ef11ea53f170fe3491b199c113e47932e175 + 401 + 320 + Arial + 14 + 36 + 36 + + 128 + 128 + 192 + + + + test_data + 娴嬭瘯鏁版嵁 + + + + + + + 869fc70cf3a4e92e8056b40814df8e03f9f9efde + d82778c36626013cd39fd790da6f55a9762f0c76 + + + + + varchar(n) + + + false + false + true + true + false + + + + + + + + + + + false + false + false + + + 0 + + + + ac02f2d1fff63fa66db583735eb1c8e9b466872f + 3e14b40dc07c134329a40752973acfad2ffdc48b + + + + + varchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 2fed92437d28f1427e913aba1251fe0807c7b209 + 8050d948828b16267482e9e3716219321f206b81 + + + + + nvarchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 6697b12cf2f6d7135570c2a581212ee067c13206 + 3664605e054c39531ca8e91aa4463c955a993357 + + + + + varchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 68b9381c1fb6668186fef70f52fc0c14b1bd6f1c + f7b189ecdc92c78bfaae9c736318ab6a5aedd396 + + + + + varchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 791691b791efedc2d14867a152b4de58f4567326 + 6e4837ab55b592669ccc7ebfc8b1ed96a00607b3 + + + + + varchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + cdc46f802299958a2b3140200410caf5cbeb8a27 + 9fb81bdc12ed017f62e9dd4529025e536eff7f08 + + + + + varchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + a27ebfd109532e2f551b101a0c78b3f50a3d58dd + 9d9478798ed2766a81b0e5a8a022eb89d9c5cc34 + + + + + datetime + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 95ec23c1b2704817cca94d169aed5e11deb0adbb + c131dc5cb7ce6f1aa5e8d5f86f2002c8ae1bb8f6 + + + + + datetime + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 2eda719a62fb7e1d3face62555046d938abddda9 + cfe3c330968a9a824c2cf933b227887d3e9615ac + + + + + varchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + e2270df5e0974bf471fdfe36e29bc9a8aa1774cb + 23041cb30875514136904ea11043c7ea1924f048 + + + + + varchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 23b25e48c87be0e4f3952f7a8330594e9d511a4e + b6d5dc8745c0fa484ed6f14e90a42282ca1b285d + + + + + varchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 8bc627205b6e55931d09079fcd07bfacbbd38f41 + d244401ff7302bb5b75092016531952d093b238b + + + + + nvarchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + 35ae805d1da92afdb99b2fe8c536d1649356fccd + + + + + + + + +
+ + 5a836e654b7b7d19f102e87336fefa079d98a2e6 + 438 + 346 + Arial + 14 + 468 + 36 + + 128 + 128 + 192 + + + + test_data_child + 娴嬭瘯鏁版嵁瀛愯〃 + + + + + + + 869fc70cf3a4e92e8056b40814df8e03f9f9efde + 34477707bcf8a7810e12e9565aff085f6fb1e0ad + + + + + varchar(n) + + + false + false + true + true + false + + + + + + + + + + + false + false + false + + + 0 + + + + ae103dc1fb50094552e56afd72015481271913db + ec8a047dffe3cf2e4d95ba3e26c3bac0382d95c9 + + + + + integer + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + d829e707316a49d39e5a11da5f5d36030a856b86 + b095c44611ed08156277676d9a3a0ce52b9b05ef + + + + + varchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + ac02f2d1fff63fa66db583735eb1c8e9b466872f + 78715aa66a10a9b190ad69b8ed792e9a2f4946e3 + + + + + varchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 2fed92437d28f1427e913aba1251fe0807c7b209 + 693f8af2fe6cf45255b6f2bc7e9077f3630c3dd8 + + + + + nvarchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 6697b12cf2f6d7135570c2a581212ee067c13206 + 04216c384533b70b8e86b571fa2beef7157bab5a + + + + + varchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 68b9381c1fb6668186fef70f52fc0c14b1bd6f1c + 0b6f63094be90aa8674460cce26be10327827ceb + + + + + varchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 791691b791efedc2d14867a152b4de58f4567326 + 363e8cfcf4a6b228e656decadacba29280906555 + + + + + varchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + cdc46f802299958a2b3140200410caf5cbeb8a27 + 7875aa5fee3d6f9587180fb8fce9343a56cdc34e + + + + + varchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + a27ebfd109532e2f551b101a0c78b3f50a3d58dd + 61c49a2f7807c55c8f85110c30889d5b403e4b04 + + + + + datetime + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 95ec23c1b2704817cca94d169aed5e11deb0adbb + b91171b99f3628aadb0e6986fbfa30cc547b280e + + + + + datetime + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 2eda719a62fb7e1d3face62555046d938abddda9 + 9f33d190101e56f93f5ece0fd7c5cdda3e704b4c + + + + + varchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + e2270df5e0974bf471fdfe36e29bc9a8aa1774cb + 16121b5aa08fc170883408ec2d0487281a132d9d + + + + + varchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 23b25e48c87be0e4f3952f7a8330594e9d511a4e + 1afc7f146271f5c90ea811aa24c08ce25d12552e + + + + + varchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 8bc627205b6e55931d09079fcd07bfacbbd38f41 + 343f0db997b913f299b0496c4306d3617ad708de + + + + + nvarchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + + + + + + + +
+ + + + 845c82ebd869d5620b1ef2c2b6f438b11a045082 + BaseEntity + + + 869fc70cf3a4e92e8056b40814df8e03f9f9efde + 02ecedc0de5850cba25bc91919ed39d414b74111 + + + + + varchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + ba0fb53af3ccc8b0e5d73baa58ec27fbb7973097 + 2fe6a36385238c1b21c76deae00a7afa00ff5538 + + + + + character(n) + + + false + false + true + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + + + ea920cba2fe0eaee64a2310ece7cda4b198b37ec + BaseEntityCorp + + + 136ca02f1b3a96a8f2e242d5dd64d48f566143ef + b8ea4b73d6d32a222e5abfd453287575ae518480 + + + + + varchar(n) + + 0 + false + false + true + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + f116706ac00cd3a3ee88b2a88debf7ebc3eeb12d + b94f5fe344185c40739cf93d1090686001bb11e0 + + + + + nvarchar(n) + + JeeSite + false + false + true + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + + + 35ae805d1da92afdb99b2fe8c536d1649356fccd + DataEntity + + + 17718c2364a2368c2072da279c927d7ad3bfcf08 + f0036584bd8711715579d21994a0105935605a7e + + + + + character(n) + + 0 + false + false + true + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 1a3b3f8bccfce8894d117d6bdb0a6b104bfb80ef + c391a15752a8eb58bc558a39d1b431f7ee125e0e + + + + + varchar(n) + + + false + false + true + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + dba1aec0c72d79ea73ed4ebde07696cf4df174b7 + e2e82ba86e15fd67397355e711255b1625078ae1 + + + + + datetime + + + false + false + true + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 2c6b290f30c6f9e100f6c77eab0cba7bb3386768 + fd0546fc2d4e01c35dcbc23913add68a99fabd73 + + + + + varchar(n) + + + false + false + true + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + f0bdbc4002f4a1b7fb7c5026bc21a7689c549728 + f8ea4fc4a778a0b94398a661a1ed8608f0e8d28d + + + + + datetime + + + false + false + true + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 8f7d3761c17a1b8632d186a3c67cb08dca18c498 + 69e01b6d4f42df40a09540ef4ba10ed8e006abaa + + + + + nvarchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + + + 85024a2953cf3e3c9c1cce49b2351853ab0d125b + DataEntityNoStatus + + + 1a3b3f8bccfce8894d117d6bdb0a6b104bfb80ef + e5355faba5ec3c9128507dd4c48ea9230631cf83 + + + + + varchar(n) + + + false + false + true + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + dba1aec0c72d79ea73ed4ebde07696cf4df174b7 + 6bed374c39d181003a4f92d76d79a4119176ba0c + + + + + datetime + + + false + false + true + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 2c6b290f30c6f9e100f6c77eab0cba7bb3386768 + f9db19bb567760bbdd554d75bbfdc891c89f9da9 + + + + + varchar(n) + + + false + false + true + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + f0bdbc4002f4a1b7fb7c5026bc21a7689c549728 + ee78b079f7d319bf8119fd01439cd97424ff49fa + + + + + datetime + + + false + false + true + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 8f7d3761c17a1b8632d186a3c67cb08dca18c498 + f7b88ecec0ef386bb384c228842a7587432112fb + + + + + nvarchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + + + 118dab95fc1f792cd468b9f66af2d4fabd98c39b + ExtendEntity + + + ad6f9eff50476669df62b7601cbc3a2e0c905d36 + 6ccadddab6ce48441ca7abd798cda6f3debf4a0c + + + + + nvarchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 3a24133d2be4831e99d1319983e5393bcf964ff9 + 93ab0ba3b47b01934614dbd3e572358c9f99e6ea + + + + + nvarchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 40e1afbbad28d28e371dd1ab77fb56640b1cb66b + a78c7961910a5e697027d1a3530b1afaa8ea8c94 + + + + + nvarchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + a2d6b5a494fc1a3d29360d922296521c6640856b + 40085364ec7a58653e96f8659aadd258d7556bc7 + + + + + nvarchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 29f701cc6a308fbfc5b12b80fee621ceeb231dcc + 9787d7fe93ee31c5b4979fd620ff6e4b2777eccf + + + + + nvarchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + c9a37a7b6a5451930ca63e36814767f742cd1393 + 95c55b81b7e9e1a9bb01aa3d88fb90c648641c4e + + + + + nvarchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 8c26203d310a4e602cf0c0fc8a7b2c818219c1dc + 16f44dfc7964796f109293bc49afd58dcb4eec1f + + + + + nvarchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 54448f19b0f5d1630bf29f9f99787802c36ebddb + 39b1dffa083f74afc30df621845cf7f0ed71394f + + + + + nvarchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + a1d747cd40768ac9f85176518ee48cb513bae110 + 7584cc6360ae7edc99e1f619042eba5865b2c4c7 + + + + + decimal(p) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + a9f0e14d6691c397990abe4ef1ff21674dccf401 + f0b5383e05c6b3f6e5f65b33b33009826c83d014 + + + + + decimal(p) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 2ce06c5cf87d93bb1e3f47268dbc679be4b6dd8d + 260d5f31009fff18000d1e64f4f877926e621306 + + + + + decimal(p) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 53d8c730fcec69d341f44089817ae06eb4844278 + a83144f40e7ae64e46a4b4ed651379774a953b17 + + + + + decimal(p) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 4c0cc4ae32f8774cc319f516784430204aef0bdb + 2a5203a275171a250870cf6cb224a910aa9354ec + + + + + decimal(p,s) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 2e958c528620621985af4394590198feed57cdf9 + 3ef5bd65a7dcd74b9a9d8a292ec395f66b7de32b + + + + + decimal(p,s) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 7c25ad75662553c7d4a58fa66eb50ca7c0ffee59 + 01d0849bdda56a8d8f24befdadc3fc9b007ae92b + + + + + decimal(p,s) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 1f81990c9694963f032c302d1834b972a6f2eb74 + 1c8ed63d72f40f0fe2f05815675771bdf3f824f8 + + + + + decimal(p,s) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + f01926071736b56b898949cc0720149c71504324 + 2b49e875138bfb329aaa352629650b7881435123 + + + + + datetime + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 942700093ab61c3be0bdf6b23bcba210bcc30281 + 5c6ec16226d85b0411b7077cb9a6e0c7aa8d74d1 + + + + + datetime + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + f221902bf89fe94dece8ccf309f59cc2c479d63f + d92b8f7fa7a2be49c7f00c447a603b136e84261d + + + + + datetime + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + c8d21e24bc69aac295703b0bae56269035b729f0 + 095a76f07a3cd2bdc6cc442757c11012e1974f4a + + + + + datetime + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 80cd53da9d5a1b19676537e590e20fa2793e902c + 42c5d8f490f69b93e77698efa030ca23988ae696 + + + + + varchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + + + a535b6c506004a7fdf4d48984c9ff2cfa59c157a + TreeEntity + + + b18ce64a2a72d00b26515583d8bbfea282f30ea8 + 394369b90c0a5b6efeed3cf823c642605d7a1653 + + + + + varchar(n) + + + false + false + true + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 5887f9db78a9ebc7b23b9a163c6f68100257c0e5 + e8d877396943acfec73023dba2c1c6e3d7802d62 + + + + + varchar(n) + + + false + false + true + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 16c9c333062ea3614d2e044803b872676c8a5377 + 23f973124aedd0244533f4e7b3b103c548b966be + + + + + decimal(p) + + + false + false + true + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + a886757c87fb1e04c5f84b6a802e129baaec2ca6 + 984d5eac2b3221118a61655e4a5a49c78e0f0151 + + + + + varchar(n) + + + false + false + true + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 40b63ab3e485fd55370d6d04b063c4397483ebc1 + b2f246a3f0ade317eaa9915e2fd539abae5a5ec8 + + + + + character(n) + + + false + false + true + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 3b9c3307b7140f27edeb47ffe307a662b2856627 + f5a9968479420f08da2e98d21136b3ed4b6e396f + + + + + decimal(p) + + + false + false + true + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + bf5e60dee567b3ed0f12e8f3ffa1f74e43012b3a + 618194ebfc8c6c42efcef3a4af0b8054f6af209b + + + + + varchar(n) + + + false + false + true + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + + + + + + + + + + + \ No newline at end of file diff --git a/modules/biz/pom.xml b/modules/biz/pom.xml new file mode 100644 index 0000000..11138a6 --- /dev/null +++ b/modules/biz/pom.xml @@ -0,0 +1,46 @@ + + + 4.0.0 + + + com.jeesite + jeesite-parent + 5.15.1.springboot3-SNAPSHOT + ../../parent/pom.xml + + + jeesite-module-biz + jar + + JeeSite Module 涓氬姟妯″潡 + https://jeesite.com + 2013-Now + + + + + + com.jeesite + jeesite-module-core + ${project.parent.version} + + + + + + + thinkgem + WangZhen + thinkgem at 163.com + Project lead + +8 + + + + + JeeSite + https://jeesite.com + + + \ No newline at end of file diff --git a/modules/biz/src/main/resources/application-assistant.yml b/modules/biz/src/main/resources/application-assistant.yml new file mode 100644 index 0000000..e421b5c --- /dev/null +++ b/modules/biz/src/main/resources/application-assistant.yml @@ -0,0 +1,12 @@ + +## 閲嶈鎻愮ず锛圱ip锛夛細 + +## 璇峰嬁鍦ㄨ閰嶇疆鏂囦欢涓坊鍔犲叾瀹冧换浣曢厤缃紙娣诲姞涔熶笉浼氱敓鏁堬級銆 +## 璇ユ枃浠讹紝浠呬粎鏄负浜嗚 jeesite-biz.yml 鏂囦欢锛 +## 鍦 IDEA 涓湁涓涓嚜鍔ㄥ畬鎴愬強甯姪鎻愮ず锛屽苟鏃犲叾瀹冪敤鎰忋 +## 鍙傛暟閰嶇疆璇峰湪 jeesite-bpm.yml 鏂囦欢涓坊鍔犮 + +spring: + config: + import: + - classpath:config/jeesite-biz.yml \ No newline at end of file diff --git a/modules/biz/src/main/resources/config/jeesite-biz.yml b/modules/biz/src/main/resources/config/jeesite-biz.yml new file mode 100644 index 0000000..756ba06 --- /dev/null +++ b/modules/biz/src/main/resources/config/jeesite-biz.yml @@ -0,0 +1,4 @@ +# 娓╅Θ鎻愮ず锛氫笉寤鸿鐩存帴淇敼姝ゆ枃浠讹紝涓轰簡骞冲彴鍗囩骇鏂逛究锛屽缓璁皢闇瑕佷慨鏀圭殑鍙傛暟鍊硷紝澶嶅埗鍒癮pplication.yml閲岃繘琛岃鐩栬鍙傛暟鍊笺 + +#biz: +# enabled: true \ No newline at end of file diff --git a/modules/biz/src/main/resources/db/upgrade/biz/versions b/modules/biz/src/main/resources/db/upgrade/biz/versions new file mode 100644 index 0000000..1a1f2cf --- /dev/null +++ b/modules/biz/src/main/resources/db/upgrade/biz/versions @@ -0,0 +1 @@ +5.15.1 \ No newline at end of file diff --git a/modules/erp/bin/deploy.bat b/modules/erp/bin/deploy.bat new file mode 100644 index 0000000..f1293bd --- /dev/null +++ b/modules/erp/bin/deploy.bat @@ -0,0 +1,25 @@ +@echo off +rem /** +rem * Copyright (c) 2013-Now https://jeesite.com All rights reserved. +rem * No deletion without permission, or be held responsible to law. +rem * +rem * Author: ThinkGem@163.com +rem */ +echo. +echo [信息] 部署工程到Maven服务器。 +echo. + +%~d0 +cd %~dp0 + +if defined JAVA_HOME17 ( + set "JAVA_HOME=%JAVA_HOME17%" & set "PATH=%JAVA_HOME17%\bin;%PATH%" +) +call mvn -v +echo. + +cd .. +call mvn clean deploy -Dmaven.test.skip=true -Pdeploy + +cd bin +pause \ No newline at end of file diff --git a/modules/erp/bin/deploy.sh b/modules/erp/bin/deploy.sh new file mode 100644 index 0000000..e387c2b --- /dev/null +++ b/modules/erp/bin/deploy.sh @@ -0,0 +1,21 @@ +#!/bin/sh +# /** +# * Copyright (c) 2013-Now https://jeesite.com All rights reserved. +# * No deletion without permission, or be held responsible to law. +# * +# * Author: ThinkGem@163.com +# */ +echo "" +echo "[淇℃伅] 閮ㄧ讲宸ョ▼鍒癕aven鏈嶅姟鍣ㄣ" +echo "" + +if [ -n "$JAVA_HOME17" ] && [ -d "$JAVA_HOME17" ]; then + export JAVA_HOME="$JAVA_HOME17" PATH="$JAVA_HOME/bin:$PATH" +fi +mvn -v +echo "" + +cd .. +mvn clean deploy -Dmaven.test.skip=true -Pdeploy + +cd bin \ No newline at end of file diff --git a/modules/erp/bin/package.bat b/modules/erp/bin/package.bat new file mode 100644 index 0000000..0010627 --- /dev/null +++ b/modules/erp/bin/package.bat @@ -0,0 +1,25 @@ +@echo off +rem /** +rem * Copyright (c) 2013-Now https://jeesite.com All rights reserved. +rem * No deletion without permission, or be held responsible to law. +rem * +rem * Author: ThinkGem@163.com +rem */ +echo. +echo [信息] 打包安装工程，生成jar包文件。 +echo. + +%~d0 +cd %~dp0 + +if defined JAVA_HOME17 ( + set "JAVA_HOME=%JAVA_HOME17%" & set "PATH=%JAVA_HOME17%\bin;%PATH%" +) +call mvn -v +echo. + +cd .. +call mvn clean install -Dmaven.test.skip=true -Ppackage + +cd bin +pause \ No newline at end of file diff --git a/modules/erp/bin/package.sh b/modules/erp/bin/package.sh new file mode 100644 index 0000000..2fcc785 --- /dev/null +++ b/modules/erp/bin/package.sh @@ -0,0 +1,21 @@ +#!/bin/sh +# /** +# * Copyright (c) 2013-Now https://jeesite.com All rights reserved. +# * No deletion without permission, or be held responsible to law. +# * +# * Author: ThinkGem@163.com +# */ +echo "" +echo "[淇℃伅] 鎵撳寘瀹夎宸ョ▼锛岀敓鎴恓ar鍖呮枃浠躲" +echo "" + +if [ -n "$JAVA_HOME17" ] && [ -d "$JAVA_HOME17" ]; then + export JAVA_HOME="$JAVA_HOME17" PATH="$JAVA_HOME/bin:$PATH" +fi +mvn -v +echo "" + +cd .. +mvn clean install -Dmaven.test.skip=true -Ppackage + +cd bin \ No newline at end of file diff --git a/modules/erp/db/erp.erm b/modules/erp/db/erp.erm new file mode 100644 index 0000000..b828a6a --- /dev/null +++ b/modules/erp/db/erp.erm @@ -0,0 +1,3590 @@ + + + + true + 100 + A4 210 x 297 mm + 30 + 30 + 30 + 30 + + 0 + 1.0 + 0 + 0 + + 128 + 128 + 192 + + + 255 + 255 + 255 + + Arial + 14 + + StandardSQL + false + + + 0 + true + 2 + 1 + 1 + false + true + false + false + + + db/erp.sql + UTF-8 + CR+LF + false + 7be191506f9daa8070b3ac14921dffd44063d2bb + null + + true + false + true + false + true + false + false + false + false + false + false + false + false + false + false + true + false + true + false + false + + + + + null + db/erp.xls + + + en + + true + true + true + + + + true + true + true + + + db/erp.png + + true + true + + + + + + + false + + + + + 0 + + + + false + false + + + + + false + + + + + + -1 + -1 + Arial + 14 + 50 + 50 + + 255 + 255 + 255 + + + + false + 2016-12-25 17:25:00 + + Project Name + + + + Model Name + + + + Version + + + + Company + + + + Author + + + + + + + + + 7be191506f9daa8070b3ac14921dffd44063d2bb + Default + + + + + + 136ca02f1b3a96a8f2e242d5dd64d48f566143ef + 64 + null + false + null + false + false + false + + false + 绉熸埛浠ｇ爜 + 绉熸埛浠ｇ爜 + corp_code + varchar(n) + + + f116706ac00cd3a3ee88b2a88debf7ebc3eeb12d + 100 + null + false + null + false + false + false + + false + 绉熸埛鍚嶇О + 绉熸埛鍚嶇О + corp_name + nvarchar(n) + + + 1a3b3f8bccfce8894d117d6bdb0a6b104bfb80ef + 64 + null + false + null + false + false + false + + false + + 鍒涘缓鑰 + create_by + varchar(n) + + + dba1aec0c72d79ea73ed4ebde07696cf4df174b7 + null + null + false + null + false + false + false + + false + + 鍒涘缓鏃堕棿 + create_date + datetime + + + f01926071736b56b898949cc0720149c71504324 + null + null + false + null + false + false + false + + false + + 鎵╁睍 Date 1 + extend_d1 + datetime + + + 942700093ab61c3be0bdf6b23bcba210bcc30281 + null + null + false + null + false + false + false + + false + + 鎵╁睍 Date 2 + extend_d2 + datetime + + + f221902bf89fe94dece8ccf309f59cc2c479d63f + null + null + false + null + false + false + false + + false + + 鎵╁睍 Date 3 + extend_d3 + datetime + + + c8d21e24bc69aac295703b0bae56269035b729f0 + null + null + false + null + false + false + false + + false + + 鎵╁睍 Date 4 + extend_d4 + datetime + + + 4c0cc4ae32f8774cc319f516784430204aef0bdb + 19 + 4 + false + null + false + false + false + + false + + 鎵╁睍 Float 1 + extend_f1 + decimal(p,s) + + + 2e958c528620621985af4394590198feed57cdf9 + 19 + 4 + false + null + false + false + false + + false + + 鎵╁睍 Float 2 + extend_f2 + decimal(p,s) + + + 7c25ad75662553c7d4a58fa66eb50ca7c0ffee59 + 19 + 4 + false + null + false + false + false + + false + + 鎵╁睍 Float 3 + extend_f3 + decimal(p,s) + + + 1f81990c9694963f032c302d1834b972a6f2eb74 + 19 + 4 + false + null + false + false + false + + false + + 鎵╁睍 Float 4 + extend_f4 + decimal(p,s) + + + a1d747cd40768ac9f85176518ee48cb513bae110 + 19 + null + false + null + false + false + false + + false + + 鎵╁睍 Integer 1 + extend_i1 + decimal(p) + + + a9f0e14d6691c397990abe4ef1ff21674dccf401 + 19 + null + false + null + false + false + false + + false + + 鎵╁睍 Integer 2 + extend_i2 + decimal(p) + + + 2ce06c5cf87d93bb1e3f47268dbc679be4b6dd8d + 19 + null + false + null + false + false + false + + false + + 鎵╁睍 Integer 3 + extend_i3 + decimal(p) + + + 53d8c730fcec69d341f44089817ae06eb4844278 + 19 + null + false + null + false + false + false + + false + + 鎵╁睍 Integer 4 + extend_i4 + decimal(p) + + + 80cd53da9d5a1b19676537e590e20fa2793e902c + 1000 + null + false + null + false + false + false + + false + + 鎵╁睍 JSON + extend_json + varchar(n) + + + ad6f9eff50476669df62b7601cbc3a2e0c905d36 + 500 + null + false + null + false + false + false + + false + + 鎵╁睍 String 1 + extend_s1 + nvarchar(n) + + + 3a24133d2be4831e99d1319983e5393bcf964ff9 + 500 + null + false + null + false + false + false + + false + + 鎵╁睍 String 2 + extend_s2 + nvarchar(n) + + + 40e1afbbad28d28e371dd1ab77fb56640b1cb66b + 500 + null + false + null + false + false + false + + false + + 鎵╁睍 String 3 + extend_s3 + nvarchar(n) + + + a2d6b5a494fc1a3d29360d922296521c6640856b + 500 + null + false + null + false + false + false + + false + + 鎵╁睍 String 4 + extend_s4 + nvarchar(n) + + + 29f701cc6a308fbfc5b12b80fee621ceeb231dcc + 500 + null + false + null + false + false + false + + false + + 鎵╁睍 String 5 + extend_s5 + nvarchar(n) + + + c9a37a7b6a5451930ca63e36814767f742cd1393 + 500 + null + false + null + false + false + false + + false + + 鎵╁睍 String 6 + extend_s6 + nvarchar(n) + + + 8c26203d310a4e602cf0c0fc8a7b2c818219c1dc + 500 + null + false + null + false + false + false + + false + + 鎵╁睍 String 7 + extend_s7 + nvarchar(n) + + + 54448f19b0f5d1630bf29f9f99787802c36ebddb + 500 + null + false + null + false + false + false + + false + + 鎵╁睍 String 8 + extend_s8 + nvarchar(n) + + + 869fc70cf3a4e92e8056b40814df8e03f9f9efde + 64 + null + false + null + false + false + false + + false + + 缂栧彿 + id + varchar(n) + + + b18ce64a2a72d00b26515583d8bbfea282f30ea8 + 64 + null + false + null + false + false + false + + false + + 鐖剁骇缂栧彿 + parent_code + varchar(n) + + + 5887f9db78a9ebc7b23b9a163c6f68100257c0e5 + 767 + null + false + null + false + false + false + + false + + 鎵鏈夌埗绾х紪鍙 + parent_codes + varchar(n) + + + 8f7d3761c17a1b8632d186a3c67cb08dca18c498 + 500 + null + false + null + false + false + false + + false + + 澶囨敞淇℃伅 + remarks + nvarchar(n) + + + ba0fb53af3ccc8b0e5d73baa58ec27fbb7973097 + 1 + null + false + null + false + false + false + + false + + 鐘舵侊紙0姝ｅ父 1鍒犻櫎 2鍋滅敤 3鍐荤粨 4瀹℃牳 5椹冲洖 9鑽夌ǹ锛 + status + character(n) + + + 17718c2364a2368c2072da279c927d7ad3bfcf08 + 1 + null + false + null + false + false + false + + false + + 鐘舵侊紙0姝ｅ父 1鍒犻櫎 2鍋滅敤锛 + status + character(n) + + + 23b25e48c87be0e4f3952f7a8330594e9d511a4e + 64 + null + false + null + false + false + false + + false + + 鍖哄煙閫夋嫨 + test_area_code + varchar(n) + + + 8bc627205b6e55931d09079fcd07bfacbbd38f41 + 100 + null + false + null + false + false + false + + false + + 鍖哄煙鍚嶇О + test_area_name + nvarchar(n) + + + cdc46f802299958a2b3140200410caf5cbeb8a27 + 200 + null + false + null + false + false + false + + false + + 澶嶉夋 + test_checkbox + varchar(n) + + + d829e707316a49d39e5a11da5f5d36030a856b86 + 64 + null + false + null + false + false + false + + false + + 鐖惰〃涓婚敭 + test_data_id + varchar(n) + + + a27ebfd109532e2f551b101a0c78b3f50a3d58dd + null + null + false + null + false + false + false + + false + + 鏃ユ湡閫夋嫨 + test_date + datetime + + + 95ec23c1b2704817cca94d169aed5e11deb0adbb + null + null + false + null + false + false + false + + false + + 鏃ユ湡鏃堕棿 + test_datetime + datetime + + + ac02f2d1fff63fa66db583735eb1c8e9b466872f + 200 + null + false + null + false + false + false + + false + + 鍗曡鏂囨湰 + test_input + varchar(n) + + + e2270df5e0974bf471fdfe36e29bc9a8aa1774cb + 64 + null + false + null + false + false + false + + false + + 鏈烘瀯閫夋嫨 + test_office_code + varchar(n) + + + 791691b791efedc2d14867a152b4de58f4567326 + 10 + null + false + null + false + false + false + + false + + 鍗曢夋 + test_radio + varchar(n) + + + 6697b12cf2f6d7135570c2a581212ee067c13206 + 10 + null + false + null + false + false + false + + false + + 涓嬫媺妗 + test_select + varchar(n) + + + 68b9381c1fb6668186fef70f52fc0c14b1bd6f1c + 200 + null + false + null + false + false + false + + false + + 涓嬫媺澶氶 + test_select_multiple + varchar(n) + + + ae103dc1fb50094552e56afd72015481271913db + null + null + false + null + false + false + false + + false + + 鎺掑簭鍙 + test_sort + integer + + + 2fed92437d28f1427e913aba1251fe0807c7b209 + 200 + null + false + null + false + false + false + + false + + 澶氳鏂囨湰 + test_textarea + nvarchar(n) + + + 2eda719a62fb7e1d3face62555046d938abddda9 + 64 + null + false + null + false + false + false + + false + + 鐢ㄦ埛閫夋嫨 + test_user_code + varchar(n) + + + 70e9482ae432d16e734a730100e366ddab33564c + 64 + null + false + null + false + false + false + + false + + 鑺傜偣缂栫爜 + tree_code + varchar(n) + + + 40b63ab3e485fd55370d6d04b063c4397483ebc1 + 1 + null + false + null + false + false + false + + false + + 鏄惁鏈鏈骇 + tree_leaf + character(n) + + + 3b9c3307b7140f27edeb47ffe307a662b2856627 + 4 + null + false + null + false + false + false + + false + + 灞傛绾у埆 + tree_level + decimal(p) + + + 5356a60d0801c47941dd2fb4565cf785bb58e2d3 + 200 + null + false + null + false + false + false + + false + + 鑺傜偣鍚嶇О + tree_name + nvarchar(n) + + + bf5e60dee567b3ed0f12e8f3ffa1f74e43012b3a + 767 + null + false + null + false + false + false + + false + + 鍏ㄨ妭鐐瑰悕 + tree_names + varchar(n) + + + 16c9c333062ea3614d2e044803b872676c8a5377 + 10 + null + false + null + false + false + false + + false + + 鎺掑簭鍙凤紙鍗囧簭锛 + tree_sort + decimal(p) + + + a886757c87fb1e04c5f84b6a802e129baaec2ca6 + 767 + null + false + null + false + false + false + + false + + 鎵鏈夋帓搴忓彿 + tree_sorts + varchar(n) + + + 2c6b290f30c6f9e100f6c77eab0cba7bb3386768 + 64 + null + false + null + false + false + false + + false + + 鏇存柊鑰 + update_by + varchar(n) + + + f0bdbc4002f4a1b7fb7c5026bc21a7689c549728 + null + null + false + null + false + false + false + + false + + 鏇存柊鏃堕棿 + update_date + datetime + + + + + + + e553474c37270813e70025e433a4cf8a64653e13 + 438 + 387 + Arial + 14 + 864 + 36 + + 128 + 128 + 192 + + + + test_tree + 娴嬭瘯鏍戣〃 + + + + + + + 70e9482ae432d16e734a730100e366ddab33564c + 7e417ee9d0dd69c767a5853922621946ed4fb2d8 + + + + + varchar(n) + + + false + false + true + true + false + + + + + + + + + + + false + false + false + + + 0 + + + a535b6c506004a7fdf4d48984c9ff2cfa59c157a + + 5356a60d0801c47941dd2fb4565cf785bb58e2d3 + 39f501890586173d229e83610cfbfaa6e3a85374 + + + + + nvarchar(n) + + + false + false + true + false + false + + + + + + + + + + + false + false + false + + + 0 + + + 35ae805d1da92afdb99b2fe8c536d1649356fccd + + + + + + + + +
+ + 5435ef11ea53f170fe3491b199c113e47932e175 + 401 + 320 + Arial + 14 + 36 + 36 + + 128 + 128 + 192 + + + + test_data + 娴嬭瘯鏁版嵁 + + + + + + + 869fc70cf3a4e92e8056b40814df8e03f9f9efde + d82778c36626013cd39fd790da6f55a9762f0c76 + + + + + varchar(n) + + + false + false + true + true + false + + + + + + + + + + + false + false + false + + + 0 + + + + ac02f2d1fff63fa66db583735eb1c8e9b466872f + 3e14b40dc07c134329a40752973acfad2ffdc48b + + + + + varchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 2fed92437d28f1427e913aba1251fe0807c7b209 + 8050d948828b16267482e9e3716219321f206b81 + + + + + nvarchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 6697b12cf2f6d7135570c2a581212ee067c13206 + 3664605e054c39531ca8e91aa4463c955a993357 + + + + + varchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 68b9381c1fb6668186fef70f52fc0c14b1bd6f1c + f7b189ecdc92c78bfaae9c736318ab6a5aedd396 + + + + + varchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 791691b791efedc2d14867a152b4de58f4567326 + 6e4837ab55b592669ccc7ebfc8b1ed96a00607b3 + + + + + varchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + cdc46f802299958a2b3140200410caf5cbeb8a27 + 9fb81bdc12ed017f62e9dd4529025e536eff7f08 + + + + + varchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + a27ebfd109532e2f551b101a0c78b3f50a3d58dd + 9d9478798ed2766a81b0e5a8a022eb89d9c5cc34 + + + + + datetime + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 95ec23c1b2704817cca94d169aed5e11deb0adbb + c131dc5cb7ce6f1aa5e8d5f86f2002c8ae1bb8f6 + + + + + datetime + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 2eda719a62fb7e1d3face62555046d938abddda9 + cfe3c330968a9a824c2cf933b227887d3e9615ac + + + + + varchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + e2270df5e0974bf471fdfe36e29bc9a8aa1774cb + 23041cb30875514136904ea11043c7ea1924f048 + + + + + varchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 23b25e48c87be0e4f3952f7a8330594e9d511a4e + b6d5dc8745c0fa484ed6f14e90a42282ca1b285d + + + + + varchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 8bc627205b6e55931d09079fcd07bfacbbd38f41 + d244401ff7302bb5b75092016531952d093b238b + + + + + nvarchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + 35ae805d1da92afdb99b2fe8c536d1649356fccd + + + + + + + + +
+ + 5a836e654b7b7d19f102e87336fefa079d98a2e6 + 438 + 346 + Arial + 14 + 468 + 36 + + 128 + 128 + 192 + + + + test_data_child + 娴嬭瘯鏁版嵁瀛愯〃 + + + + + + + 869fc70cf3a4e92e8056b40814df8e03f9f9efde + 34477707bcf8a7810e12e9565aff085f6fb1e0ad + + + + + varchar(n) + + + false + false + true + true + false + + + + + + + + + + + false + false + false + + + 0 + + + + ae103dc1fb50094552e56afd72015481271913db + ec8a047dffe3cf2e4d95ba3e26c3bac0382d95c9 + + + + + integer + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + d829e707316a49d39e5a11da5f5d36030a856b86 + b095c44611ed08156277676d9a3a0ce52b9b05ef + + + + + varchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + ac02f2d1fff63fa66db583735eb1c8e9b466872f + 78715aa66a10a9b190ad69b8ed792e9a2f4946e3 + + + + + varchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 2fed92437d28f1427e913aba1251fe0807c7b209 + 693f8af2fe6cf45255b6f2bc7e9077f3630c3dd8 + + + + + nvarchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 6697b12cf2f6d7135570c2a581212ee067c13206 + 04216c384533b70b8e86b571fa2beef7157bab5a + + + + + varchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 68b9381c1fb6668186fef70f52fc0c14b1bd6f1c + 0b6f63094be90aa8674460cce26be10327827ceb + + + + + varchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 791691b791efedc2d14867a152b4de58f4567326 + 363e8cfcf4a6b228e656decadacba29280906555 + + + + + varchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + cdc46f802299958a2b3140200410caf5cbeb8a27 + 7875aa5fee3d6f9587180fb8fce9343a56cdc34e + + + + + varchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + a27ebfd109532e2f551b101a0c78b3f50a3d58dd + 61c49a2f7807c55c8f85110c30889d5b403e4b04 + + + + + datetime + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 95ec23c1b2704817cca94d169aed5e11deb0adbb + b91171b99f3628aadb0e6986fbfa30cc547b280e + + + + + datetime + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 2eda719a62fb7e1d3face62555046d938abddda9 + 9f33d190101e56f93f5ece0fd7c5cdda3e704b4c + + + + + varchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + e2270df5e0974bf471fdfe36e29bc9a8aa1774cb + 16121b5aa08fc170883408ec2d0487281a132d9d + + + + + varchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 23b25e48c87be0e4f3952f7a8330594e9d511a4e + 1afc7f146271f5c90ea811aa24c08ce25d12552e + + + + + varchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 8bc627205b6e55931d09079fcd07bfacbbd38f41 + 343f0db997b913f299b0496c4306d3617ad708de + + + + + nvarchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + + + + + + + +
+ + + + 845c82ebd869d5620b1ef2c2b6f438b11a045082 + BaseEntity + + + 869fc70cf3a4e92e8056b40814df8e03f9f9efde + 02ecedc0de5850cba25bc91919ed39d414b74111 + + + + + varchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + ba0fb53af3ccc8b0e5d73baa58ec27fbb7973097 + 2fe6a36385238c1b21c76deae00a7afa00ff5538 + + + + + character(n) + + + false + false + true + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + + + ea920cba2fe0eaee64a2310ece7cda4b198b37ec + BaseEntityCorp + + + 136ca02f1b3a96a8f2e242d5dd64d48f566143ef + b8ea4b73d6d32a222e5abfd453287575ae518480 + + + + + varchar(n) + + 0 + false + false + true + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + f116706ac00cd3a3ee88b2a88debf7ebc3eeb12d + b94f5fe344185c40739cf93d1090686001bb11e0 + + + + + nvarchar(n) + + JeeSite + false + false + true + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + + + 35ae805d1da92afdb99b2fe8c536d1649356fccd + DataEntity + + + 17718c2364a2368c2072da279c927d7ad3bfcf08 + f0036584bd8711715579d21994a0105935605a7e + + + + + character(n) + + 0 + false + false + true + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 1a3b3f8bccfce8894d117d6bdb0a6b104bfb80ef + c391a15752a8eb58bc558a39d1b431f7ee125e0e + + + + + varchar(n) + + + false + false + true + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + dba1aec0c72d79ea73ed4ebde07696cf4df174b7 + e2e82ba86e15fd67397355e711255b1625078ae1 + + + + + datetime + + + false + false + true + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 2c6b290f30c6f9e100f6c77eab0cba7bb3386768 + fd0546fc2d4e01c35dcbc23913add68a99fabd73 + + + + + varchar(n) + + + false + false + true + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + f0bdbc4002f4a1b7fb7c5026bc21a7689c549728 + f8ea4fc4a778a0b94398a661a1ed8608f0e8d28d + + + + + datetime + + + false + false + true + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 8f7d3761c17a1b8632d186a3c67cb08dca18c498 + 69e01b6d4f42df40a09540ef4ba10ed8e006abaa + + + + + nvarchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + + + 85024a2953cf3e3c9c1cce49b2351853ab0d125b + DataEntityNoStatus + + + 1a3b3f8bccfce8894d117d6bdb0a6b104bfb80ef + e5355faba5ec3c9128507dd4c48ea9230631cf83 + + + + + varchar(n) + + + false + false + true + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + dba1aec0c72d79ea73ed4ebde07696cf4df174b7 + 6bed374c39d181003a4f92d76d79a4119176ba0c + + + + + datetime + + + false + false + true + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 2c6b290f30c6f9e100f6c77eab0cba7bb3386768 + f9db19bb567760bbdd554d75bbfdc891c89f9da9 + + + + + varchar(n) + + + false + false + true + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + f0bdbc4002f4a1b7fb7c5026bc21a7689c549728 + ee78b079f7d319bf8119fd01439cd97424ff49fa + + + + + datetime + + + false + false + true + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 8f7d3761c17a1b8632d186a3c67cb08dca18c498 + f7b88ecec0ef386bb384c228842a7587432112fb + + + + + nvarchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + + + 118dab95fc1f792cd468b9f66af2d4fabd98c39b + ExtendEntity + + + ad6f9eff50476669df62b7601cbc3a2e0c905d36 + 6ccadddab6ce48441ca7abd798cda6f3debf4a0c + + + + + nvarchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 3a24133d2be4831e99d1319983e5393bcf964ff9 + 93ab0ba3b47b01934614dbd3e572358c9f99e6ea + + + + + nvarchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 40e1afbbad28d28e371dd1ab77fb56640b1cb66b + a78c7961910a5e697027d1a3530b1afaa8ea8c94 + + + + + nvarchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + a2d6b5a494fc1a3d29360d922296521c6640856b + 40085364ec7a58653e96f8659aadd258d7556bc7 + + + + + nvarchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 29f701cc6a308fbfc5b12b80fee621ceeb231dcc + 9787d7fe93ee31c5b4979fd620ff6e4b2777eccf + + + + + nvarchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + c9a37a7b6a5451930ca63e36814767f742cd1393 + 95c55b81b7e9e1a9bb01aa3d88fb90c648641c4e + + + + + nvarchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 8c26203d310a4e602cf0c0fc8a7b2c818219c1dc + 16f44dfc7964796f109293bc49afd58dcb4eec1f + + + + + nvarchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 54448f19b0f5d1630bf29f9f99787802c36ebddb + 39b1dffa083f74afc30df621845cf7f0ed71394f + + + + + nvarchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + a1d747cd40768ac9f85176518ee48cb513bae110 + 7584cc6360ae7edc99e1f619042eba5865b2c4c7 + + + + + decimal(p) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + a9f0e14d6691c397990abe4ef1ff21674dccf401 + f0b5383e05c6b3f6e5f65b33b33009826c83d014 + + + + + decimal(p) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 2ce06c5cf87d93bb1e3f47268dbc679be4b6dd8d + 260d5f31009fff18000d1e64f4f877926e621306 + + + + + decimal(p) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 53d8c730fcec69d341f44089817ae06eb4844278 + a83144f40e7ae64e46a4b4ed651379774a953b17 + + + + + decimal(p) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 4c0cc4ae32f8774cc319f516784430204aef0bdb + 2a5203a275171a250870cf6cb224a910aa9354ec + + + + + decimal(p,s) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 2e958c528620621985af4394590198feed57cdf9 + 3ef5bd65a7dcd74b9a9d8a292ec395f66b7de32b + + + + + decimal(p,s) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 7c25ad75662553c7d4a58fa66eb50ca7c0ffee59 + 01d0849bdda56a8d8f24befdadc3fc9b007ae92b + + + + + decimal(p,s) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 1f81990c9694963f032c302d1834b972a6f2eb74 + 1c8ed63d72f40f0fe2f05815675771bdf3f824f8 + + + + + decimal(p,s) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + f01926071736b56b898949cc0720149c71504324 + 2b49e875138bfb329aaa352629650b7881435123 + + + + + datetime + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 942700093ab61c3be0bdf6b23bcba210bcc30281 + 5c6ec16226d85b0411b7077cb9a6e0c7aa8d74d1 + + + + + datetime + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + f221902bf89fe94dece8ccf309f59cc2c479d63f + d92b8f7fa7a2be49c7f00c447a603b136e84261d + + + + + datetime + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + c8d21e24bc69aac295703b0bae56269035b729f0 + 095a76f07a3cd2bdc6cc442757c11012e1974f4a + + + + + datetime + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 80cd53da9d5a1b19676537e590e20fa2793e902c + 42c5d8f490f69b93e77698efa030ca23988ae696 + + + + + varchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + + + a535b6c506004a7fdf4d48984c9ff2cfa59c157a + TreeEntity + + + b18ce64a2a72d00b26515583d8bbfea282f30ea8 + 394369b90c0a5b6efeed3cf823c642605d7a1653 + + + + + varchar(n) + + + false + false + true + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 5887f9db78a9ebc7b23b9a163c6f68100257c0e5 + e8d877396943acfec73023dba2c1c6e3d7802d62 + + + + + varchar(n) + + + false + false + true + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 16c9c333062ea3614d2e044803b872676c8a5377 + 23f973124aedd0244533f4e7b3b103c548b966be + + + + + decimal(p) + + + false + false + true + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + a886757c87fb1e04c5f84b6a802e129baaec2ca6 + 984d5eac2b3221118a61655e4a5a49c78e0f0151 + + + + + varchar(n) + + + false + false + true + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 40b63ab3e485fd55370d6d04b063c4397483ebc1 + b2f246a3f0ade317eaa9915e2fd539abae5a5ec8 + + + + + character(n) + + + false + false + true + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 3b9c3307b7140f27edeb47ffe307a662b2856627 + f5a9968479420f08da2e98d21136b3ed4b6e396f + + + + + decimal(p) + + + false + false + true + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + bf5e60dee567b3ed0f12e8f3ffa1f74e43012b3a + 618194ebfc8c6c42efcef3a4af0b8054f6af209b + + + + + varchar(n) + + + false + false + true + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + + + + + + + + + + + \ No newline at end of file diff --git a/modules/erp/pom.xml b/modules/erp/pom.xml new file mode 100644 index 0000000..d00131d --- /dev/null +++ b/modules/erp/pom.xml @@ -0,0 +1,46 @@ + + + 4.0.0 + + + com.jeesite + jeesite-parent + 5.15.1.springboot3-SNAPSHOT + ../../parent/pom.xml + + + jeesite-module-erp + jar + + JeeSite Module 璐㈠姟绠＄悊 + https://jeesite.com + 2013-Now + + + + + + com.jeesite + jeesite-module-core + ${project.parent.version} + + + + + + + thinkgem + WangZhen + thinkgem at 163.com + Project lead + +8 + + + + + JeeSite + https://jeesite.com + + + \ No newline at end of file diff --git a/modules/erp/src/main/resources/application-assistant.yml b/modules/erp/src/main/resources/application-assistant.yml new file mode 100644 index 0000000..3cb6c77 --- /dev/null +++ b/modules/erp/src/main/resources/application-assistant.yml @@ -0,0 +1,12 @@ + +## 閲嶈鎻愮ず锛圱ip锛夛細 + +## 璇峰嬁鍦ㄨ閰嶇疆鏂囦欢涓坊鍔犲叾瀹冧换浣曢厤缃紙娣诲姞涔熶笉浼氱敓鏁堬級銆 +## 璇ユ枃浠讹紝浠呬粎鏄负浜嗚 jeesite-erp.yml 鏂囦欢锛 +## 鍦 IDEA 涓湁涓涓嚜鍔ㄥ畬鎴愬強甯姪鎻愮ず锛屽苟鏃犲叾瀹冪敤鎰忋 +## 鍙傛暟閰嶇疆璇峰湪 jeesite-bpm.yml 鏂囦欢涓坊鍔犮 + +spring: + config: + import: + - classpath:config/jeesite-erp.yml \ No newline at end of file diff --git a/modules/erp/src/main/resources/config/jeesite-erp.yml b/modules/erp/src/main/resources/config/jeesite-erp.yml new file mode 100644 index 0000000..353bfe2 --- /dev/null +++ b/modules/erp/src/main/resources/config/jeesite-erp.yml @@ -0,0 +1,4 @@ +# 娓╅Θ鎻愮ず锛氫笉寤鸿鐩存帴淇敼姝ゆ枃浠讹紝涓轰簡骞冲彴鍗囩骇鏂逛究锛屽缓璁皢闇瑕佷慨鏀圭殑鍙傛暟鍊硷紝澶嶅埗鍒癮pplication.yml閲岃繘琛岃鐩栬鍙傛暟鍊笺 + +#erp: +# enabled: true \ No newline at end of file diff --git a/modules/erp/src/main/resources/db/upgrade/erp/versions b/modules/erp/src/main/resources/db/upgrade/erp/versions new file mode 100644 index 0000000..1a1f2cf --- /dev/null +++ b/modules/erp/src/main/resources/db/upgrade/erp/versions @@ -0,0 +1 @@ +5.15.1 \ No newline at end of file diff --git a/modules/pom.xml b/modules/pom.xml index 9df00fb..1d8fb2f 100644 --- a/modules/pom.xml +++ b/modules/pom.xml @@ -1,39 +1,43 @@ - 4.0.0 - - com.jeesite - jeesite-modules - 5.15.1.springboot3-SNAPSHOT - pom - - JeeSite Modules - https://jeesite.com - 2013-Now - - - ai - app - cms - core - core/static - test - - - - - thinkgem - WangZhen - thinkgem at 163.com - Project lead - +8 - - - - - JeeSite - https://jeesite.com - - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + + com.jeesite + jeesite-modules + 5.15.1.springboot3-SNAPSHOT + pom + + JeeSite Modules + https://jeesite.com + 2013-Now + + + ai + app + cms + biz + erp + core + core/static + test + + + + + thinkgem + WangZhen + thinkgem at 163.com + + Project lead + + +8 + + + + + JeeSite + https://jeesite.com + + diff --git a/web-api/pom.xml b/web-api/pom.xml index e54e9d8..23e5ee4 100644 --- a/web-api/pom.xml +++ b/web-api/pom.xml @@ -1,128 +1,148 @@ - 4.0.0 - - - com.jeesite - jeesite-parent - 5.15.1.springboot3-SNAPSHOT - ../parent/pom.xml - - - jeesite-web-api - jar - - 涓撲负鍒嗙绔彁渚涙帴鍙ｆ湇鍔★紝鍏抽棴鍐呯疆鐧诲綍椤靛拰涓绘鏋堕〉瑙嗗浘 - - JeeSite Web Api - https://jeesite.com - 2013-Now - - - - mySpring - com.jeesite.modules.ApiApplication + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 - - 8980:8980 - - + + com.jeesite + jeesite-parent + 5.15.1.springboot3-SNAPSHOT + ../parent/pom.xml + - + jeesite-web-api + jar - - - com.jeesite - jeesite-module-core - ${project.parent.version} - + 涓撲负鍒嗙绔彁渚涙帴鍙ｆ湇鍔★紝鍏抽棴鍐呯疆鐧诲綍椤靛拰涓绘鏋堕〉瑙嗗浘 - - - com.jeesite - jeesite-module-test - ${project.parent.version} - + JeeSite Web Api + https://jeesite.com + 2013-Now - - - com.jeesite - jeesite-module-swagger - ${project.parent.version} - + - - - com.jeesite - jeesite-module-cms - ${project.parent.version} - + mySpring + com.jeesite.modules.ApiApplication - - - com.jeesite - jeesite-module-app - ${project.parent.version} - + + 8980:8980 - - - - ${finalName} - - - org.springframework.boot - spring-boot-maven-plugin - - true - - + + + + + + com.jeesite + jeesite-module-biz + ${project.parent.version} + + + + com.jeesite + jeesite-module-erp + ${project.parent.version} + + + + + com.jeesite + jeesite-module-core + ${project.parent.version} + + + + + com.jeesite + jeesite-module-test + ${project.parent.version} + + + + + com.jeesite + jeesite-module-swagger + ${project.parent.version} + + + + + com.jeesite + jeesite-module-cms + ${project.parent.version} + + + + + com.jeesite + jeesite-module-app + ${project.parent.version} + + + + + + ${finalName} + + + org.springframework.boot + spring-boot-maven-plugin + + true + + + + + + org.apache.maven.plugins + maven-war-plugin + + ${finalName} + + + + + + org.apache.maven.plugins + maven-eclipse-plugin + + ${finalName} + + + + + + + + + aliyun-repos + https://maven.aliyun.com/repository/public + + true + + + false + + + + jeesite-repos + https://maven.jeesite.net/repository/maven-public + + + + + aliyun-repos + https://maven.aliyun.com/repository/public + + true + + + false + + + + jeesite-repos + https://maven.jeesite.net/repository/maven-public + + - - - org.apache.maven.plugins - maven-war-plugin - - ${finalName} - - - - - - org.apache.maven.plugins - maven-eclipse-plugin - - ${finalName} - - - - - - - - - aliyun-repos - https://maven.aliyun.com/repository/public - true - false - - - jeesite-repos - https://maven.jeesite.net/repository/maven-public - - - - - aliyun-repos - https://maven.aliyun.com/repository/public - true - false - - - jeesite-repos - https://maven.jeesite.net/repository/maven-public - - - diff --git a/web-api/src/main/java/com/jeesite/modules/utils/AesUtil.java b/web-api/src/main/java/com/jeesite/modules/utils/AesUtil.java new file mode 100644 index 0000000..b34f535 --- /dev/null +++ b/web-api/src/main/java/com/jeesite/modules/utils/AesUtil.java @@ -0,0 +1,109 @@ +package com.jeesite.modules.utils; + +import javax.crypto.Cipher; +import javax.crypto.spec.IvParameterSpec; +import javax.crypto.spec.SecretKeySpec; +import java.nio.charset.StandardCharsets; +import java.util.Base64; +import java.util.Arrays; +import java.util.concurrent.ThreadLocalRandom; + +/** + * AES鍔犲瘑瑙ｅ瘑宸ュ叿绫伙紙CBC/PKCS5Padding锛 + * 浼樺寲璇存槑锛氫慨澶嶅瘑閽UG+瑙ｅ喅鎹㈣闂+鎬ц兘浼樺寲+瀹夊叏鍔犲浐+闆朵緷璧 + */ +public class AesUtil { + + + private static final LoggerUtils logger = LoggerUtils.getInstance(); + private static final String AES_KEY_HEX = "AD42F6697B035B7580E4FEF93BE20BAD"; // 浣犵殑32浣16杩涘埗瀵嗛挜 + private static final String CHARSET = StandardCharsets.UTF_8.name(); + private static final int IV_LENGTH = 16; // AES CBC IV鍥哄畾16瀛楄妭 + private static final String TRANSFORMATION = "AES/CBC/PKCS5Padding"; + private static final String ALGORITHM = "AES"; + + private static final ThreadLocal ENCRYPT_CIPHER = ThreadLocal.withInitial(() -> { + try { + return Cipher.getInstance(TRANSFORMATION); + } catch (Exception e) { + throw new RuntimeException(e); + } + }); + private static final ThreadLocal DECRYPT_CIPHER = ThreadLocal.withInitial(() -> { + try { + return Cipher.getInstance(TRANSFORMATION); + } catch (Exception e) { + throw new RuntimeException(e); + } + }); + + /** + * 鍔犲瘑 + */ + public static String encrypt(String content) { + return encrypt(content, hex2Bytes(AES_KEY_HEX)); + } + + /** + * 瑙ｅ瘑 + */ + public static String decrypt(String content) { + return decrypt(content, hex2Bytes(AES_KEY_HEX)); + } + + public static String encrypt(String content, byte[] key) { + if (content == null || content.isEmpty()) { + return ""; + } + try { + SecretKeySpec secretKey = new SecretKeySpec(key, ALGORITHM); + IvParameterSpec iv = new IvParameterSpec(Arrays.copyOf(key, IV_LENGTH)); + Cipher cipher = ENCRYPT_CIPHER.get(); + cipher.init(Cipher.ENCRYPT_MODE, secretKey, iv); + byte[] encryptBytes = cipher.doFinal(content.getBytes(CHARSET)); + return Base64.getEncoder().encodeToString(encryptBytes); + } catch (Exception e) { + throw new RuntimeException(e); + } + } + + public static String decrypt(String content, byte[] key) { + if (content == null || content.isEmpty()) { + return ""; + } + try { + SecretKeySpec secretKey = new SecretKeySpec(key, ALGORITHM); + IvParameterSpec iv = new IvParameterSpec(Arrays.copyOf(key, IV_LENGTH)); + Cipher cipher = DECRYPT_CIPHER.get(); + cipher.init(Cipher.DECRYPT_MODE, secretKey, iv); + byte[] decryptBytes = cipher.doFinal(Base64.getDecoder().decode(content)); + String result = new String(decryptBytes, CHARSET); + return result.trim(); + } catch (Exception e) { + throw new RuntimeException(e); + } + } + + /** + * 32浣16杩涘埗瀛楃涓茶浆16瀛楄妭鏁扮粍锛堣В鍐充綘鐨勫瘑閽ラ暱搴UG鐨勬牳蹇冩柟娉曪級 + */ + private static byte[] hex2Bytes(String hexStr) { + if (hexStr == null || hexStr.length() % 2 != 0) { + throw new IllegalArgumentException("瀵嗛挜蹇呴』鏄伓鏁伴暱搴︾殑16杩涘埗瀛楃涓"); + } + byte[] bytes = new byte[hexStr.length() / 2]; + for (int i = 0; i < bytes.length; i++) { + bytes[i] = (byte) Integer.parseInt(hexStr.substring(i * 2, i * 2 + 2), 16); + } + return bytes; + } + + /** + * 鐢熸垚闅忔満16瀛楄妭IV鍚戦噺锛堟柟妗2锛氬畨鍏ㄩ殢鏈篒V锛屾柊涓氬姟鎺ㄨ崘浣跨敤锛 + */ + private static byte[] generateRandomIV() { + byte[] iv = new byte[IV_LENGTH]; + ThreadLocalRandom.current().nextBytes(iv); + return iv; + } +} \ No newline at end of file diff --git a/web-api/src/main/java/com/jeesite/modules/utils/DateUtils.java b/web-api/src/main/java/com/jeesite/modules/utils/DateUtils.java new file mode 100644 index 0000000..30376ec --- /dev/null +++ b/web-api/src/main/java/com/jeesite/modules/utils/DateUtils.java @@ -0,0 +1,53 @@ +package com.jeesite.modules.utils; + +import java.time.LocalDate; +import java.time.format.DateTimeFormatter; + +public class DateUtils { + private static final DateTimeFormatter MONTH_FORMATTER = DateTimeFormatter.ofPattern("MM"); + private static final DateTimeFormatter YEAR_FORMATTER = DateTimeFormatter.ofPattern("yyyy"); + private static final DateTimeFormatter DATE_FORMATTER = DateTimeFormatter.ofPattern("yyyyMMdd"); + private static final DateTimeFormatter YEAR_MONTH_CN_FORMATTER = DateTimeFormatter.ofPattern("yyyy骞碝M鏈"); + + private static final DateTimeFormatter SHORT_YEAR_MONTH_CN_FORMATTER = DateTimeFormatter.ofPattern("yy骞碝M鏈"); + + + + public static String dsValue() { + LocalDate currentDate = LocalDate.now(); + return currentDate.format(DATE_FORMATTER); + } + + public static String dsValueDaysAgo(long days) { + LocalDate targetDate = LocalDate.now().minusDays(days); + return targetDate.format(DATE_FORMATTER); + } + + public static String getCurrentYear() { + LocalDate currentDate = LocalDate.now(); + return currentDate.format(YEAR_FORMATTER); + } + + public static String getCurrentMonth() { + LocalDate currentDate = LocalDate.now(); + return currentDate.format(MONTH_FORMATTER); + } + + public static String getCurrentYearMonthCN() { + LocalDate currentDate = LocalDate.now(); + return currentDate.format(YEAR_MONTH_CN_FORMATTER); + } + + public static String getCurrentShortYearMonthCN() { + LocalDate currentDate = LocalDate.now(); + return currentDate.format(SHORT_YEAR_MONTH_CN_FORMATTER); + } + + public static String getYear(LocalDate date) { + return date.format(YEAR_FORMATTER); + } + + public static String getMonth(LocalDate date) { + return date.format(MONTH_FORMATTER); + } +} \ No newline at end of file diff --git a/web-api/src/main/java/com/jeesite/modules/utils/KeyUtil.java b/web-api/src/main/java/com/jeesite/modules/utils/KeyUtil.java new file mode 100644 index 0000000..4568fb7 --- /dev/null +++ b/web-api/src/main/java/com/jeesite/modules/utils/KeyUtil.java @@ -0,0 +1,48 @@ +package com.jeesite.modules.utils; + +import java.util.Random; + +public class KeyUtil { + + public static String ObjKey(int length, int type) { + Random random = new Random(); + StringBuffer key = new StringBuffer(); + if (type == 1) { + String str = "0123456789"; + for (int i = 0; i < length; ++i) { + //浠62涓殑鏁板瓧鎴栧瓧姣嶄腑閫夋嫨 + int number = random.nextInt(10); + //灏嗕骇鐢熺殑鏁板瓧閫氳繃length娆℃壙杞藉埌key涓 + key.append(str.charAt(number)); + } + return key.toString(); + } else if (type == 2) { + String str = "ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"; + for (int i = 0; i < length; ++i) { + //浠62涓殑鏁板瓧鎴栧瓧姣嶄腑閫夋嫨 + int number = random.nextInt(36); + //灏嗕骇鐢熺殑鏁板瓧閫氳繃length娆℃壙杞藉埌key涓 + key.append(str.charAt(number)); + } + return key.toString(); + } else if (type == 3) { + String str = "abcdefghijklmnopqrstuvwxyz0123456789"; + for (int i = 0; i < length; ++i) { + //浠62涓殑鏁板瓧鎴栧瓧姣嶄腑閫夋嫨 + int number = random.nextInt(36); + //灏嗕骇鐢熺殑鏁板瓧閫氳繃length娆℃壙杞藉埌key涓 + key.append(str.charAt(number)); + } + return key.toString(); + } else { + String str = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"; + for (int i = 0; i < length; ++i) { + //浠62涓殑鏁板瓧鎴栧瓧姣嶄腑閫夋嫨 + int number = random.nextInt(62); + //灏嗕骇鐢熺殑鏁板瓧閫氳繃length娆℃壙杞藉埌key涓 + key.append(str.charAt(number)); + } + return key.toString(); + } + } +} diff --git a/web-api/src/main/java/com/jeesite/modules/utils/LoggerUtils.java b/web-api/src/main/java/com/jeesite/modules/utils/LoggerUtils.java new file mode 100644 index 0000000..841db57 --- /dev/null +++ b/web-api/src/main/java/com/jeesite/modules/utils/LoggerUtils.java @@ -0,0 +1,187 @@ +package com.jeesite.modules.utils; + +import java.io.*; +import java.nio.charset.StandardCharsets; +import java.nio.file.Files; +import java.nio.file.Paths; +import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.concurrent.locks.ReentrantLock; + + +public class LoggerUtils { + + // 鏃ュ織绾у埆 + public enum Level { + DEBUG, INFO, WARN, ERROR + } + + // 鍗曚緥瀹炰緥 + private static volatile LoggerUtils instance; + + private String baseLogPath; + + + private final SimpleDateFormat logDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS"); + + // 绾跨▼瀹夊叏閿 + private final ReentrantLock lock = new ReentrantLock(); + + // 绂佹澶栭儴瀹炰緥鍖 + private LoggerUtils(String baseLogPath) { + this.baseLogPath = baseLogPath; + initLogDir(); // 鍒濆鍖栨棩蹇楃洰褰 + } + + public static LoggerUtils getInstance() { + return getInstance("/ogsapp/logs"); + } + + /** + * 鑾峰彇鍗曚緥瀹炰緥锛堣嚜瀹氫箟鏃ュ織璺緞锛 + * + * @param baseLogPath 鏃ュ織鏍圭洰褰曪紙鏀寔鐩稿璺緞鎴栫粷瀵硅矾寰勶級 + */ + public static LoggerUtils getInstance(String baseLogPath) { + if (instance == null) { + synchronized (LoggerUtils.class) { + if (instance == null) { + instance = new LoggerUtils(baseLogPath); + } + } + } + return instance; + } + + /** + * 鍒濆鍖栨棩蹇楃洰褰曪紙鑻ヤ笉瀛樺湪鍒欏垱寤哄绾х洰褰曪級 + */ + private void initLogDir() { + try { + Files.createDirectories(Paths.get(baseLogPath)); + } catch (IOException e) { + throw new RuntimeException("鍒濆鍖栨棩蹇楃洰褰曞け璐ワ細" + baseLogPath, e); + } + } + + private String getCurrentLogFilePath(Level level) { + String fileName = level + "_APP" + ".log"; + return baseLogPath + File.separator + fileName; + } + + // ------------------------------ 鏃ュ織鏂规硶锛堟敮鎸佸绫诲瀷鍙彉鍙傛暟锛 ------------------------------ + + /** + * 璁板綍DEBUG绾у埆鏃ュ織锛堟敮鎸1鍒板涓换鎰忕被鍨嬪弬鏁帮級 + */ + public void debug(Object... messages) { + log(Level.DEBUG, joinMessages(messages), null); + } + + /** + * 璁板綍INFO绾у埆鏃ュ織锛堟敮鎸1鍒板涓换鎰忕被鍨嬪弬鏁帮級 + */ + public void info(Object... messages) { + log(Level.INFO, joinMessages(messages), null); + } + + /** + * 璁板綍WARN绾у埆鏃ュ織锛堟敮鎸1鍒板涓换鎰忕被鍨嬪弬鏁帮級 + */ + public void warn(Object... messages) { + log(Level.WARN, joinMessages(messages), null); + } + + /** + * 璁板綍WARN绾у埆鏃ュ織锛堟敮鎸1鍒板涓换鎰忕被鍨嬪弬鏁+寮傚父锛 + */ + public void warn(Object[] messages, Throwable throwable) { + log(Level.WARN, joinMessages(messages), throwable); + } + + /** + * 璁板綍ERROR绾у埆鏃ュ織锛堟敮鎸1鍒板涓换鎰忕被鍨嬪弬鏁帮級 + */ + public void error(Object... messages) { + log(Level.ERROR, joinMessages(messages), null); + } + + /** + * 璁板綍ERROR绾у埆鏃ュ織锛堟敮鎸1鍒板涓换鎰忕被鍨嬪弬鏁+寮傚父锛 + */ + public void error(Object[] messages, Throwable throwable) { + log(Level.ERROR, joinMessages(messages), throwable); + } + + // ------------------------------ 鏍稿績鏂规硶 ------------------------------ + + /** + * 鏍稿績鏃ュ織鍐欏叆閫昏緫 + */ + private void log(Level level, String message, Throwable throwable) { + // 鏋勫缓鏃ュ織鍐呭 + StringBuilder logContent = new StringBuilder(); + logContent.append("[").append(logDateFormat.format(new Date())).append("] "); // 鏃堕棿鎴 + logContent.append("[").append(level.name()).append("] "); // 鏃ュ織绾у埆 + logContent.append("[Thread-").append(Thread.currentThread().getId()).append("] "); // 绾跨▼ID + logContent.append(message); // 鎷兼帴鍚庣殑娑堟伅 + + // 杩藉姞寮傚父鍫嗘爤淇℃伅锛堝鏋滄湁锛 + if (throwable != null) { + logContent.append("\n").append(getStackTrace(throwable)); + } + logContent.append("\n"); // 姣忔潯鏃ュ織鎹㈣ + + // 鍔犻攣鍐欏叆鏂囦欢锛堜繚璇佺嚎绋嬪畨鍏級 + lock.lock(); + try (BufferedWriter writer = new BufferedWriter( + new OutputStreamWriter( + new FileOutputStream(getCurrentLogFilePath(level), true), // 杩藉姞妯″紡 + StandardCharsets.UTF_8 // 閬垮厤涓枃涔辩爜 + ) + )) { + System.out.print(logContent); + writer.write(logContent.toString()); + writer.flush(); + } catch (IOException e) { + System.err.println("鏃ュ織鍐欏叆澶辫触锛" + e.getMessage()); + } finally { + lock.unlock(); + } + } + + /** + * 鎷兼帴澶氱被鍨嬪彲鍙樺弬鏁颁负鍗曚釜瀛楃涓诧紙鑷姩杞崲浠绘剰绫诲瀷涓哄瓧绗︿覆锛屽鐞唍ull锛 + * + * @param messages 1鍒板涓换鎰忕被鍨嬪弬鏁帮紙涓嶅彲涓虹┖鏁扮粍锛 + * @return 鎷兼帴鍚庣殑瀛楃涓 + */ + private String joinMessages(Object... messages) { + if (messages == null || messages.length == 0) { + throw new IllegalArgumentException("鏃ュ織娑堟伅鑷冲皯闇瑕1涓弬鏁"); + } + StringBuilder sb = new StringBuilder(); + for (Object msg : messages) { + sb.append(msg); + } + return sb.toString(); + } + + /** + * 寮傚父鍫嗘爤淇℃伅杞负瀛楃涓 + */ + private String getStackTrace(Throwable throwable) { + StringWriter sw = new StringWriter(); + PrintWriter pw = new PrintWriter(sw); + throwable.printStackTrace(pw); + return sw.toString(); + } + + /** + * 鍔ㄦ佷慨鏀规棩蹇楄矾寰 + */ + public void setBaseLogPath(String baseLogPath) { + this.baseLogPath = baseLogPath; + initLogDir(); + } +} \ No newline at end of file diff --git a/web-api/src/main/resources/config/application.yml b/web-api/src/main/resources/config/application.yml index 6082eda..6b8f059 100644 --- a/web-api/src/main/resources/config/application.yml +++ b/web-api/src/main/resources/config/application.yml @@ -58,70 +58,11 @@ jdbc: # Mysql 鏁版嵁搴撻厤缃 type: mysql driver: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://127.0.0.1:13306/my_app?useSSL=false&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=CONVERT_TO_NULL&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true + url: jdbc:mysql://192.168.31.182:13306/system?useSSL=false&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=CONVERT_TO_NULL&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true username: dream password: info_dream testSql: SELECT 1 -# # Oracle 鏁版嵁搴撻厤缃 -# type: oracle -# driver: oracle.jdbc.OracleDriver -# url: jdbc:oracle:thin:@127.0.0.1:1521/orcl -# username: jeesite -# password: jeesite -# testSql: SELECT 1 FROM DUAL - -# # Sql Server 鏁版嵁搴撻厤缃紙2008 鐗堟湰锛岃鎵撳紑 /modules/core/pom.xml 鏂囦欢锛屾浛鎹负 SqlServer 2008 椹卞姩骞剁紪璇戞墦鍖 core 妯″潡锛 -# type: mssql -# driver: net.sourceforge.jtds.jdbc.Driver -# url: jdbc:jtds:sqlserver://127.0.0.1:1433/jeesite -# username: jeesite -# password: jeesite -# testSql: SELECT 1 - -# # Sql Server 鏁版嵁搴撻厤缃紙2012 鍙婁互涓婄増鏈紝璇锋墦寮 /modules/core/pom.xml 鏂囦欢锛屾浛鎹负 SqlServer 2021 椹卞姩骞剁紪璇戞墦鍖 core 妯″潡锛 -# type: mssql2012 -# driver: com.microsoft.sqlserver.jdbc.SQLServerDriver -# url: jdbc:sqlserver://127.0.0.1:1433;DatabaseName=jeesite;encrypt=true;trustServerCertificate=true -# username: jeesite -# password: jeesite -# testSql: SELECT 1 - -# # PostgreSql 鏁版嵁搴撻厤缃 -# type: postgresql -# driver: org.postgresql.Driver -# url: jdbc:postgresql://127.0.0.1:5432/jeesite -# username: jeesite -# password: jeesite -# testSql: SELECT 1 - -# # 杈炬ⅵ鏁版嵁搴撻厤缃紝璇峰嬁浣跨敤 sysdba 鐢ㄦ埛 -# type: dameng -# driver: dm.jdbc.driver.DmDriver -# url: jdbc:dm://127.0.0.1:5236/jeesite5?schema=jeesite5 -# username: jeesite -# password: jeesite123 -# testSql: SELECT 1 FROM DUAL - -# # 浜哄ぇ閲戜粨鏁版嵁搴撻厤缃 -# type: kingbase -# driver: com.kingbase8.Driver -# url: jdbc:kingbase8://127.0.0.1:54321/jeesite?currentSchema=jeesite&UseServerPrepare=false -# username: jeesite -# password: jeesite -# testSql: SELECT 1 FROM DUAL - -# # H2 鏁版嵁搴撻厤缃紙璇锋墦寮 /modules/core/pom.xml 鏂囦欢锛屾墦寮 H2 DB 椹卞姩骞剁紪璇戞墦鍖 core 妯″潡锛 -# type: h2 -# driver: org.h2.Driver -# url: jdbc:h2:~/jeesite-db/jeesite -# username: jeesite -# password: jeesite -# testSql: SELECT 1 - - # 鏇村鏁版嵁搴撶殑鏀寔鍒楄〃锛 - # https://jeesite.com/docs/technology/#%E4%B8%83%E3%80%81%E5%B7%B2%E6%94%AF%E6%8C%81%E6%95%B0%E6%8D%AE%E5%BA%93 - # 杩炴帴淇℃伅鍔犲瘑 encrypt: @@ -140,127 +81,6 @@ jdbc: # 鏈澶ф縺娲昏繛鎺ユ暟 maxActive: 20 -# # 杩炴帴瓒呮椂鍙傛暟锛屽崟浣嶆绉 锛坴5.5.2+锛 -# connectTimeout: ~ -# socketTimeout: ~ -# -# # 鏌ヨ瓒呮椂鏃堕棿锛屼簨鍔¤秴鏃舵椂闂 锛坴5.7.1+锛 -# queryTimeout: ~ -# transactionQueryTimeout: ~ -# -# # 鑾峰彇杩炴帴绛夊緟瓒呮椂鏃堕棿锛屽崟浣嶆绉掞紙1鍒嗛挓锛夛紙4.0.6+锛 -# maxWait: 60000 -# -# # 杩炴帴澶辫触鍚庝腑鏂紝榛樿涓 false 鏃讹紝浼氫竴鐩村皾璇曡繛鎺ワ紝涓 true 鏃讹紝鑷姩涓柇灏濊瘯锛坴5.9.0+锛 -# breakAfterAcquireFailure: false -# -# # 浠庢睜涓彇鍑哄拰褰掕繕杩炴帴鍓嶈繘琛屾楠岋紝濡傛灉妫楠屽け璐ワ紝鍒欎粠姹犱腑鍘婚櫎杩炴帴骞跺皾璇曞彇鍑哄彟涓涓紙4.0.6+锛 -# testOnBorrow: false -# testOnReturn: false -# -# # 闂撮殧澶氫箙鎵嶈繘琛屼竴娆℃娴嬶紝妫娴嬮渶瑕佸叧闂殑绌洪棽杩炴帴锛屽崟浣嶆绉掞紙1鍒嗛挓锛夛紙4.0.6+锛 -# timeBetweenEvictionRunsMillis: 60000 -# -# # 涓涓繛鎺ュ湪姹犱腑鏈灏忕┖闂茬殑鏃堕棿锛屽崟浣嶆绉掞紙20鍒嗛挓锛夛紙4.0.6+锛 -# minEvictableIdleTimeMillis: 1200000 -# # 涓涓繛鎺ュ湪姹犱腑鏈澶х┖闂茬殑鏃堕棿锛屽崟浣嶆绉掞紙30鍒嗛挓锛夛紙4.1.2+锛 -# maxEvictableIdleTimeMillis: 1800000 -# -# # 杩炴帴姹犱腑鐨刴inIdle鏁伴噺浠ュ唴鐨勮繛鎺ワ紝绌洪棽鏃堕棿瓒呰繃minEvictableIdleTimeMillis锛屽垯浼氭墽琛宬eepAlive鎿嶄綔锛4.1.8+锛 -# keepAlive: false -# -# # 鏄惁鑷姩鍥炴敹娉勯湶鐨勮繛鎺ュ拰瓒呮椂鏃堕棿锛屽崟浣嶇锛35鍒嗛挓锛夛紙4.0.6+锛 -# removeAbandoned: false -# removeAbandonedTimeout: 2100 -# -# # 鏄惁缂撳瓨 PreparedStatement 瀵硅薄鐨勬渶澶ф暟閲忥紙4.1.5+锛 -# maxPoolPreparedStatementPerConnectionSize: ~ -# -# # 璁剧疆杩炴帴灞炴э紝鍙幏鍙栧埌琛ㄧ殑 remark (澶囨敞) -# remarksReporting: false - -# # 璇诲啓鍒嗙閰嶇疆锛堜笓涓氱増锛塿4.3.0 -# readwriteSplitting: -# # 璇诲簱鐨勬暟鎹簮鍚嶇О鍒楄〃锛堥粯璁ゆ暟鎹簮锛 -# readDataSourceNames: ds_read_01, ds_read_02 -# # 璐熻浇鍧囪　绠楁硶锛圧OUND_ROBIN杞銆丷ANDOM闅忔満銆佽嚜瀹氫箟绫诲悕锛 -# loadBalancerAlgorithm: RANDOM -# -# # 澶氭暟鎹簮鍚嶇О鍒楄〃锛屽涓敤閫楀彿闅斿紑锛屼娇鐢ㄦ柟娉曪細@MyBatisDao(dataSourceName="ds2") -# # v5.11.1+ 鏀寔 dataSourceNames 鍏嶉厤缃紝鑷姩璇诲彇 jdbc.鏁版嵁婧愬悕.type 鐨勫睘鎬 -# dataSourceNames: ds_read_01, ds_read_02 -# -# # 榛樿鏁版嵁婧愮殑浠庡簱01 -# ds_read_01: -# type: mysql -# driver: com.mysql.cj.jdbc.Driver -# url: jdbc:mysql://127.0.0.1:3306/jeesite_test?useSSL=false&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=CONVERT_TO_NULL&serverTimezone=Asia/Shanghai -# username: root -# password: 123456 -# testSql: SELECT 1 -# pool: -# init: 1 -# minIdle: 3 -# maxActive: 20 -# -# # 榛樿鏁版嵁婧愮殑浠庡簱02 -# ds_read_02: -# type: mysql -# driver: com.mysql.cj.jdbc.Driver -# url: jdbc:mysql://127.0.0.1:3306/jeesite_test2?useSSL=false&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=CONVERT_TO_NULL&serverTimezone=Asia/Shanghai -# username: root -# password: 123456 -# testSql: SELECT 1 -# pool: -# init: 1 -# minIdle: 3 -# maxActive: 20 - -# # 澶氭暟鎹簮鍚嶇О鍒楄〃锛屽涓敤閫楀彿闅斿紑锛屼娇鐢ㄦ柟娉曪細@MyBatisDao(dataSourceName="ds2") -# # v5.11.1+ 鏀寔 dataSourceNames 鍏嶉厤缃紝鑷姩璇诲彇 jdbc.鏁版嵁婧愬悕.type 鐨勫睘鎬 -# dataSourceNames: ds2 -# -# # 澶氭暟鎹簮閰嶇疆锛歞s2 -# ds2: -# type: mysql -# driver: com.mysql.cj.jdbc.Driver -# url: jdbc:mysql://127.0.0.1:3306/jeesite2?useSSL=false&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=CONVERT_TO_NULL&serverTimezone=Asia/Shanghai -# username: root -# password: 123456 -# testSql: SELECT 1 -# # 鍏跺畠鏁版嵁婧愭敮鎸佸瘑鐮佸姞瀵 -# encrypt: -# username: false -# password: true -# # 鍏跺畠鏁版嵁婧愭敮鎸佽繛鎺ユ睜璁剧疆 -# pool: -# init: 1 -# minIdle: 3 -# maxActive: 20 -# # 鍏跺畠鏁版嵁婧愭敮鎸佽鍐欏垎绂 -# readwriteSplitting: -# readDataSourceNames: ~ -# loadBalancerAlgorithm: RANDOM - -# # 鏁版嵁婧愭槧灏勶紙Dao绫诲悕 = 鏁版嵁婧愬悕绉帮級锛屼紭鍏堜簬 @MyBatisDao(dataSourceName="ds2") 璁剧疆 v4.3.0 -# # Dao绫诲悕锛屼笉浠呮敮鎸佹煇涓叿浣 Dao绫诲悕锛岃繕鏀寔 Dao 閲岀殑鏌愪釜鏂规硶鎸囧畾鏁版嵁婧愬悕绉帮紝杩樻敮鎸佸寘璺緞鎸囧畾鏁版嵁婧愮瓑 -# # 鏁版嵁婧愬悕鎸囧畾 {dynamic} 鏃舵敮鎸佸姩鎬侊紝鐩稿綋浜 @MyBatisDao(dataSourceName=DataSourceHolder.DYNAMIC) -# # 鏁版嵁婧愭敮鎸佹寚瀹氬彉閲 {corpCode}銆 {userCode}銆亄userCache涓殑Key鍚峿銆亄yml鎴杝ys_config涓殑Key鍚峿 -# # 浠庝笂鍒颁笅锛屽厛鍖归厤鍏堝彈鐢ㄨ鍒欙紝榛樿鏁版嵁婧愬悕涓 default 鎵╁睍鏁版嵁婧愪负 dataSourceNames 鍒楄〃閲岃嚜瀹氫箟鐨勫悕瀛 -# mybatisDaoAndDataSourceMappings: | -# TestDataChildDao = ds2 -# EmpUserDao.findList = ds2 -# com.jeesite.modules.sys. = default -# com.jeesite.modules.filemanager. = ds2 - -# # 琛ㄥ悕鍜屽瓧娈靛悕锛堝墠缂|鍚庣紑锛夋槸鍚﹀己鍒跺ぇ鍐欙紙v4.1.8+锛 -# tableAndColumn: -# prefixSuffix: "`|`" -# forceUpperCase: true -# -# # 琛ㄥ悕鍓嶇紑 -# tablePrefix: js_ - #======================================# #========== Spring settings ===========# #======================================# diff --git a/web-vue/package.json b/web-vue/package.json index 820b3fd..f854281 100644 --- a/web-vue/package.json +++ b/web-vue/package.json @@ -29,10 +29,12 @@ "@ant-design/icons-vue": "7.0.1", "@element-plus/icons-vue": "^2.3.2", "@jeesite/assets": "workspace:*", + "@jeesite/biz": "workspace:*", "@jeesite/cms": "workspace:*", "@jeesite/core": "workspace:*", "@jeesite/dbm": "workspace:*", "@jeesite/dfm": "workspace:*", + "@jeesite/erp": "workspace:*", "@jeesite/test": "workspace:*", "@jeesite/types": "workspace:*", "@jeesite/vite": "workspace:*", diff --git a/web-vue/packages/assets/images/logo.png b/web-vue/packages/assets/images/logo.png index 3477d02af6c952288b7dcf378e121244c39474e2..0c9c06d5c05259daff298315487822fea05cdd97 100644 GIT binary patch literal 14057 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 b>Ta0I8MD!RS~AyviqGVwm8B{rOoRU~(DGtr literal 7419 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 Z&x7~c-v?SiHw7L7O*K8$O2F>T{{z#rJEH&q diff --git a/web-vue/packages/assets/svg/login-box-bg.svg b/web-vue/packages/assets/svg/login-box-bg.svg index 61fa1e9..5f81c5b 100644 --- a/web-vue/packages/assets/svg/login-box-bg.svg +++ b/web-vue/packages/assets/svg/login-box-bg.svg @@ -1,98 +1 @@ - - - - - - - - - - - - responsive - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + \ No newline at end of file diff --git a/web-vue/packages/biz/README.md b/web-vue/packages/biz/README.md new file mode 100644 index 0000000..7f5a929 --- /dev/null +++ b/web-vue/packages/biz/README.md @@ -0,0 +1,22 @@ +- 瀹樻柟缃戠珯锛 +- 浣跨敤鏂囨。锛 +- 鍚庣浠ｇ爜锛 +- 鍓嶇浠ｇ爜锛 + +------ + +
+ 濡傛灉浣犲枩娆 JeeSite锛岃缁欏ス涓涓 猸愶笍 Star锛屾偍鐨勬敮鎸佸皢鏄垜浠墠琛岀殑鍔ㄥ姏銆 +
+ +------ + +- 闂鍙嶉锛 [銆愭柊鎵嬪繀璇汇慮(https://gitee.com/thinkgem/jeesite5/issues/I18ARR) +- 闇姹傛敹闆嗭細 +- QQ 缇わ細`127515876`銆乣209330483`銆乣223507718`銆乣709534275`銆乣730390092`銆乣1373527`銆乣183903863(澶栧寘)` +- 寰俊缇わ細娣诲姞瀹㈡湇寰俊 閭璇锋偍杩涚兢 +- 鍏虫敞寰俊鍏紬鍙凤紝浜嗚В鏈鏂板姩鎬侊細 + +

+ JeeSite寰俊鍏紬鍙 +

\ No newline at end of file diff --git a/web-vue/packages/biz/package.json b/web-vue/packages/biz/package.json new file mode 100644 index 0000000..f8b1e1f --- /dev/null +++ b/web-vue/packages/biz/package.json @@ -0,0 +1,30 @@ +{ + "name": "@jeesite/biz", + "version": "5.15.1", + "private": true, + "type": "module", + "scripts": { + "type:check": "vue-tsc --noEmit --skipLibCheck", + "uninstall": "rimraf node_modules", + "update": "ncu -u" + }, + "dependencies": { + "qs": "6.14.0" + }, + "devDependencies": { + "@types/qs": "6.9.18" + }, + "homepage": "https://jeesite.com", + "repository": { + "type": "git", + "url": "https://gitee.com/thinkgem/jeesite-vue.git" + }, + "bugs": { + "url": "https://gitee.com/thinkgem/jeesite-vue/issues" + }, + "author": { + "name": "ThinkGem", + "email": "thinkgem@163.com", + "url": "https://gitee.com/thinkgem" + } +} \ No newline at end of file diff --git a/web-vue/packages/biz/tsconfig.json b/web-vue/packages/biz/tsconfig.json new file mode 100644 index 0000000..689af95 --- /dev/null +++ b/web-vue/packages/biz/tsconfig.json @@ -0,0 +1,20 @@ +{ + "extends": "../../tsconfig.json", + "compilerOptions": { + "baseUrl": ".", + "paths": { + "@jeesite/biz/*": ["./*"] + } + }, + "include": [ + "./**/*.ts", + "./**/*.tsx", + "./**/*.vue" + ], + "exclude": [ + "node_modules", + "vite.config.ts", + "_lib", + "dist" + ] +} \ No newline at end of file diff --git a/web-vue/packages/core/components/Application/src/AppLogo.vue b/web-vue/packages/core/components/Application/src/AppLogo.vue index 6718131..7af2642 100644 --- a/web-vue/packages/core/components/Application/src/AppLogo.vue +++ b/web-vue/packages/core/components/Application/src/AppLogo.vue @@ -4,7 +4,7 @@ -->