Skip to content

S
smart_gov_platform
"...attendance-performance-manager-ui.git" did not exist on "dbc13d63aaf3c89826367c55991766120089ac75"
Commit 2976b64d authored by 廖旭伟's avatar 廖旭伟
Browse files
Options

Merge remote-tracking branch 'origin/master'

parents ad591a92 8ad51e40
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 51065 additions and 4256 deletions
base-manager-ui/admin/.env.production
View file @ 2976b64d
#生产环境 #生产环境
NODE_ENV = "production" NODE_ENV = "production"
VUE_APP_API_BASE_URL=http://192.168.0.251:11078 VUE_APP_API_BASE_URL=http://192.168.2.144:11078
\ No newline at end of file \ No newline at end of file
base-manager-ui/admin/.env.yibin
View file @ 2976b64d
#测试环境 #测试环境
NODE_ENV = "yibin" NODE_ENV = "production"
VUE_APP_API_BASE_URL=http://192.168.2.144:11078 VUE_APP_API_BASE_URL=http://192.168.2.144:11078
\ No newline at end of file
base-manager-ui/admin/package.json
View file @ 2976b64d
...@@ -57,7 +57,9 @@ ...@@ -57,7 +57,9 @@
"babel-eslint": "^10.1.0", "babel-eslint": "^10.1.0",
"babel-plugin-transform-remove-console": "^6.9.4", "babel-plugin-transform-remove-console": "^6.9.4",
"babel-polyfill": "^6.26.0", "babel-polyfill": "^6.26.0",
"browserslist": "^4.21.4",
"cache-loader": "^4.1.0", "cache-loader": "^4.1.0",
"caniuse-lite": "^1.0.30001442",
"compression-webpack-plugin": "^2.0.0", "compression-webpack-plugin": "^2.0.0",
"deepmerge": "^4.2.2", "deepmerge": "^4.2.2",
"eslint": "^6.7.2", "eslint": "^6.7.2",
......
base-manager-ui/admin/src/pages/basicset/surface/modal/AddSurface.vue
View file @ 2976b64d
...@@ -409,7 +409,7 @@ export default { ...@@ -409,7 +409,7 @@ export default {
type: "image/jpeg", type: "image/jpeg",
}); });
const formData = new FormData(); const formData = new FormData();
formData.append("file", blob, Date.now() + ".jpg"); formData.append("file", blob, Date.now() + ".png");
let res = await uploadFile(formData); let res = await uploadFile(formData);
let { code } = res.data; let { code } = res.data;
if (code === 1) { if (code === 1) {
......
base-manager-ui/admin/yarn.lock
View file @ 2976b64d
...@@ -2211,7 +2211,7 @@ ansi-styles@^4.1.0: ...@@ -2211,7 +2211,7 @@ ansi-styles@^4.1.0:
ant-design-vue@1.7.8: ant-design-vue@1.7.8:
version "1.7.8" version "1.7.8"
resolved "https://registry.npmmirror.com/ant-design-vue/-/ant-design-vue-1.7.8.tgz#1abbf86b68a4f5b1000bea0487b8031dc0001661" resolved "https://registry.npmmirror.com/ant-design-vue/-/ant-design-vue-1.7.8.tgz"
integrity sha512-F1hmiS9vwbyfuFvlamdW5l9bHKqRlj9wHaGDIE41NZMWXyWy8qL0UFa/+I0Wl8gQWZCqODW5pN6Yfoyn85At3A== integrity sha512-F1hmiS9vwbyfuFvlamdW5l9bHKqRlj9wHaGDIE41NZMWXyWy8qL0UFa/+I0Wl8gQWZCqODW5pN6Yfoyn85At3A==
dependencies: dependencies:
"@ant-design/icons" "^2.1.1" "@ant-design/icons" "^2.1.1"
...@@ -2747,16 +2747,15 @@ browserify-zlib@^0.2.0: ...@@ -2747,16 +2747,15 @@ browserify-zlib@^0.2.0:
dependencies: dependencies:
pako "~1.0.5" pako "~1.0.5"
browserslist@^4.0.0, browserslist@^4.12.0, browserslist@^4.8.5: browserslist@^4.0.0, browserslist@^4.12.0, browserslist@^4.21.4, browserslist@^4.8.5:
version "4.20.0" version "4.21.4"
resolved "https://registry.npmmirror.com/browserslist/-/browserslist-4.20.0.tgz" resolved "https://registry.npmmirror.com/browserslist/-/browserslist-4.21.4.tgz"
integrity sha512-bnpOoa+DownbciXj0jVGENf8VYQnE2LNWomhYuCsMmmx9Jd9lwq0WXODuwpSsp8AVdKM2/HorrzxAfbKvWTByQ== integrity sha512-CBHJJdDmgjl3daYjN5Cp5kbTf1mUhZoS+beLklHIvkOWscs83YAhLlF3Wsh/lciQYAcbBJgTOD44VtG31ZM4Hw==
dependencies: dependencies:
caniuse-lite "^1.0.30001313" caniuse-lite "^1.0.30001400"
electron-to-chromium "^1.4.76" electron-to-chromium "^1.4.251"
escalade "^3.1.1" node-releases "^2.0.6"
node-releases "^2.0.2" update-browserslist-db "^1.0.9"
picocolors "^1.0.0"
buffer-from@^1.0.0: buffer-from@^1.0.0:
version "1.1.1" version "1.1.1"
...@@ -2988,10 +2987,10 @@ caniuse-api@^3.0.0: ...@@ -2988,10 +2987,10 @@ caniuse-api@^3.0.0:
lodash.memoize "^4.1.2" lodash.memoize "^4.1.2"
lodash.uniq "^4.5.0" lodash.uniq "^4.5.0"
caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001313: caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001400, caniuse-lite@^1.0.30001442:
version "1.0.30001314" version "1.0.30001442"
resolved "https://registry.npmmirror.com/caniuse-lite/-/caniuse-lite-1.0.30001314.tgz" resolved "https://registry.npmmirror.com/caniuse-lite/-/caniuse-lite-1.0.30001442.tgz"
integrity sha512-0zaSO+TnCHtHJIbpLroX7nsD+vYuOVjl3uzFbJO1wMVbuveJA0RK2WcQA9ZUIOiO0/ArMiMgHJLxfEZhQiC0kw== integrity sha512-239m03Pqy0hwxYPYR5JwOIxRJfLTWtle9FV8zosfV5pHg+/51uD4nxcUlM8+mWWGfwKtt8lJNHnD3cWw9VZ6ow==
case-sensitive-paths-webpack-plugin@^2.3.0: case-sensitive-paths-webpack-plugin@^2.3.0:
version "2.3.0" version "2.3.0"
...@@ -3068,7 +3067,7 @@ check-types@^8.0.3: ...@@ -3068,7 +3067,7 @@ check-types@^8.0.3:
china-area-data@^5.0.1: china-area-data@^5.0.1:
version "5.0.1" version "5.0.1"
resolved "https://registry.npmmirror.com/china-area-data/-/china-area-data-5.0.1.tgz#7943b83a0619f033bb5893da80cb46e52e44be66" resolved "https://registry.npmmirror.com/china-area-data/-/china-area-data-5.0.1.tgz"
integrity sha512-BQDPpiv5Nn+018ekcJK2oSD9PAD+E1bvXB0wgabc//dFVS/KvRqCgg0QOEUt3vBkx9XzB5a9BmkJCEZDBxVjVw== integrity sha512-BQDPpiv5Nn+018ekcJK2oSD9PAD+E1bvXB0wgabc//dFVS/KvRqCgg0QOEUt3vBkx9XzB5a9BmkJCEZDBxVjVw==
china-division@^2.5.0: china-division@^2.5.0:
...@@ -4475,14 +4474,14 @@ ejs@^2.6.1: ...@@ -4475,14 +4474,14 @@ ejs@^2.6.1:
resolved "https://registry.npm.taobao.org/ejs/download/ejs-2.7.4.tgz" resolved "https://registry.npm.taobao.org/ejs/download/ejs-2.7.4.tgz"
integrity sha1-SGYSh1c9zFPjZsehrlLDoSDuybo= integrity sha1-SGYSh1c9zFPjZsehrlLDoSDuybo=
electron-to-chromium@^1.4.76: electron-to-chromium@^1.4.251:
version "1.4.77" version "1.4.284"
resolved "https://registry.npmmirror.com/electron-to-chromium/-/electron-to-chromium-1.4.77.tgz" resolved "https://registry.npmmirror.com/electron-to-chromium/-/electron-to-chromium-1.4.284.tgz"
integrity sha512-fiDxw8mO9Ph1Z0bjX2sFTPpi0J0QkOiwOJF+5Q0J0baNc/F9lLePAvDPlnoxvbUYYMizqrKPeotRRkJ9LtxAew== integrity sha512-M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA==
element-china-area-data@^5.0.2: element-china-area-data@^5.0.2:
version "5.0.2" version "5.0.2"
resolved "https://registry.npmmirror.com/element-china-area-data/-/element-china-area-data-5.0.2.tgz#006c26594b8865cb619994063c732562e4583d30" resolved "https://registry.npmmirror.com/element-china-area-data/-/element-china-area-data-5.0.2.tgz"
integrity sha512-vLQuvOKJy/uiX7MRHEk3x/j09hipuIl6DJ/C4XFUG7D7Pj3O47sy+Y6aAArM6k9v8cD9UX6e+yz2S4J+IPnZ8g== integrity sha512-vLQuvOKJy/uiX7MRHEk3x/j09hipuIl6DJ/C4XFUG7D7Pj3O47sy+Y6aAArM6k9v8cD9UX6e+yz2S4J+IPnZ8g==
dependencies: dependencies:
china-area-data "^5.0.1" china-area-data "^5.0.1"
...@@ -7119,7 +7118,7 @@ locate-path@^5.0.0: ...@@ -7119,7 +7118,7 @@ locate-path@^5.0.0:
lodash-es@^4.17.15: lodash-es@^4.17.15:
version "4.17.21" version "4.17.21"
resolved "https://registry.npmmirror.com/lodash-es/-/lodash-es-4.17.21.tgz#43e626c46e6591b7750beb2b50117390c609e3ee" resolved "https://registry.npmmirror.com/lodash-es/-/lodash-es-4.17.21.tgz"
integrity sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw== integrity sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==
lodash._reinterpolate@^3.0.0: lodash._reinterpolate@^3.0.0:
...@@ -7761,10 +7760,10 @@ node-libs-browser@^2.2.1: ...@@ -7761,10 +7760,10 @@ node-libs-browser@^2.2.1:
util "^0.11.0" util "^0.11.0"
vm-browserify "^1.0.1" vm-browserify "^1.0.1"
node-releases@^2.0.2: node-releases@^2.0.6:
version "2.0.2" version "2.0.8"
resolved "https://registry.npmmirror.com/node-releases/-/node-releases-2.0.2.tgz" resolved "https://registry.npmmirror.com/node-releases/-/node-releases-2.0.8.tgz"
integrity sha512-XxYDdcQ6eKqp/YjI+tb2C5WM2LgjnZrfYg4vgQt49EK268b6gYCHsBLrK2qvJo4FmCtqmKezb0WZFK4fkrZNsg== integrity sha512-dFSmB8fFHEH/s81Xi+Y/15DQY6VHW81nXRj86EMSL3lmuTmK1e+aT4wrFCkTbm+gSwkw4KpX+rT/pMM2c1mF+A==
nopt@1.0.10: nopt@1.0.10:
version "1.0.10" version "1.0.10"
...@@ -9019,7 +9018,7 @@ quill-delta@^3.6.2: ...@@ -9019,7 +9018,7 @@ quill-delta@^3.6.2:
quill-image-resize-module@^3.0.0: quill-image-resize-module@^3.0.0:
version "3.0.0" version "3.0.0"
resolved "https://registry.npmmirror.com/quill-image-resize-module/-/quill-image-resize-module-3.0.0.tgz#0fd93746a837336d95b2f536140416a623c71771" resolved "https://registry.npmmirror.com/quill-image-resize-module/-/quill-image-resize-module-3.0.0.tgz"
integrity sha512-1TZBnUxU/WIx5dPyVjQ9yN7C6mLZSp04HyWBEMqT320DIq4MW4JgzlOPDZX5ZpBM3bU6sacU4kTLUc8VgYQZYw== integrity sha512-1TZBnUxU/WIx5dPyVjQ9yN7C6mLZSp04HyWBEMqT320DIq4MW4JgzlOPDZX5ZpBM3bU6sacU4kTLUc8VgYQZYw==
dependencies: dependencies:
lodash "^4.17.4" lodash "^4.17.4"
...@@ -9077,7 +9076,7 @@ raw-body@2.4.0: ...@@ -9077,7 +9076,7 @@ raw-body@2.4.0:
raw-loader@^0.5.1, raw-loader@~0.5.1: raw-loader@^0.5.1, raw-loader@~0.5.1:
version "0.5.1" version "0.5.1"
resolved "https://registry.npmmirror.com/raw-loader/-/raw-loader-0.5.1.tgz#0c3d0beaed8a01c966d9787bf778281252a979aa" resolved "https://registry.npmmirror.com/raw-loader/-/raw-loader-0.5.1.tgz"
integrity sha512-sf7oGoLuaYAScB4VGr0tzetsYlS8EJH6qnTCfQ/WVEa89hALQ4RQfCKt5xCyPQKPDUbVUAIP1QsxAwfAjlDp7Q== integrity sha512-sf7oGoLuaYAScB4VGr0tzetsYlS8EJH6qnTCfQ/WVEa89hALQ4RQfCKt5xCyPQKPDUbVUAIP1QsxAwfAjlDp7Q==
rc@^1.2.8: rc@^1.2.8:
...@@ -10787,6 +10786,14 @@ upath@^1.1.0, upath@^1.1.1: ...@@ -10787,6 +10786,14 @@ upath@^1.1.0, upath@^1.1.1:
resolved "https://registry.npm.taobao.org/upath/download/upath-1.2.0.tgz" resolved "https://registry.npm.taobao.org/upath/download/upath-1.2.0.tgz"
integrity sha1-j2bbzVWog6za5ECK+LA1pQRMGJQ= integrity sha1-j2bbzVWog6za5ECK+LA1pQRMGJQ=
update-browserslist-db@^1.0.9:
version "1.0.10"
resolved "https://registry.npmmirror.com/update-browserslist-db/-/update-browserslist-db-1.0.10.tgz"
integrity sha512-OztqDenkfFkbSG+tRxBeAnCVPckDBcvibKd35yDONx6OU8N7sqgwc7rCbkJ/WcYtVRZ4ba68d6byhC21GFh7sQ==
dependencies:
escalade "^3.1.1"
picocolors "^1.0.0"
update-notifier@^4.0.0: update-notifier@^4.0.0:
version "4.1.0" version "4.1.0"
resolved "https://registry.npm.taobao.org/update-notifier/download/update-notifier-4.1.0.tgz" resolved "https://registry.npm.taobao.org/update-notifier/download/update-notifier-4.1.0.tgz"
......
base-manager/db/init_area_data.sql
View file @ 2976b64d
...@@ -3,8 +3,8 @@ use `base-platform`; ...@@ -3,8 +3,8 @@ use `base-platform`;
-- ---------------------------- -- ----------------------------
-- Table structure for mortals_sys_base_area -- Table structure for mortals_sys_base_area
-- ---------------------------- -- ----------------------------
DROP TABLE IF EXISTS `mortals_sys_base_area`; DROP TABLE IF EXISTS `mortals_sys_area`;
CREATE TABLE `mortals_sys_base_area` ( CREATE TABLE `mortals_sys_area` (
`id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '序号，主键，自增长', `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '序号，主键，自增长',
`ancestors` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '' COMMENT '祖级列表，逗号分隔', `ancestors` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '' COMMENT '祖级列表，逗号分隔',
`name` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '区域名称', `name` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '区域名称',
base-manager/db/init_base_area_data.sql 0 → 100644
View file @ 2976b64d
This diff is collapsed.
base-manager/db/params.sql
View file @ 2976b64d
...@@ -364,3 +364,6 @@ INSERT INTO `mortals_xhx_product` VALUES (null, '评级器', 'pjq', '评级器', ...@@ -364,3 +364,6 @@ INSERT INTO `mortals_xhx_product` VALUES (null, '评级器', 'pjq', '评级器',
INSERT INTO `mortals_xhx_product` VALUES (null, '自助服务终端', 'zzfwzd', '自助服务终端', 1, now(), NULL, NULL); INSERT INTO `mortals_xhx_product` VALUES (null, '自助服务终端', 'zzfwzd', '自助服务终端', 1, now(), NULL, NULL);
INSERT INTO `mortals_xhx_product` VALUES (null, '填单机', 'tdj', '填单机', 1, now(), NULL, NULL); INSERT INTO `mortals_xhx_product` VALUES (null, '填单机', 'tdj', '填单机', 1, now(), NULL, NULL);
INSERT INTO `mortals_xhx_product` VALUES (null, '样表机', 'ybj', '样表机', 1, now(), NULL, NULL); INSERT INTO `mortals_xhx_product` VALUES (null, '样表机', 'ybj', '样表机', 1, now(), NULL, NULL);
INSERT INTO `mortals_sys_model` VALUES (null, '基础设置平台', 'basic setting ', 'file/fileupload/1672810627756.svg', 'http://192.168.0.98:11071/#/jump', '基础设置平台-test', 1, '2022-04-20 09:55:59', 1, '2023-01-04 13:37:09');
base-manager/pom.xml
View file @ 2976b64d
...@@ -106,15 +106,16 @@ ...@@ -106,15 +106,16 @@
<profiles.publish.path>/home/publish</profiles.publish.path> <profiles.publish.path>/home/publish</profiles.publish.path>
<profiles.rabbitmq.host>192.168.2.144</profiles.rabbitmq.host> <profiles.rabbitmq.host>192.168.2.144</profiles.rabbitmq.host>
<profiles.rabbitmq.port>5672</profiles.rabbitmq.port> <profiles.rabbitmq.port>5672</profiles.rabbitmq.port>
<profiles.rabbitmq.username>root</profiles.rabbitmq.username> <profiles.rabbitmq.username>taxi_mq</profiles.rabbitmq.username>
<profiles.rabbitmq.password>xhx@2022</profiles.rabbitmq.password> <profiles.rabbitmq.password>admin@2020</profiles.rabbitmq.password>
<profiles.rabbitmq.virtualhost>/</profiles.rabbitmq.virtualhost> <profiles.rabbitmq.virtualhost>/</profiles.rabbitmq.virtualhost>
<profiles.nacos.server-addr>127.0.0.1:8848</profiles.nacos.server-addr> <profiles.nacos.server-addr>127.0.0.1:8848</profiles.nacos.server-addr>
<profiles.nacos.group>DEFAULT_GROUP</profiles.nacos.group> <profiles.nacos.group>DEFAULT_GROUP</profiles.nacos.group>
<profiles.nacos.namespace>smart-gov</profiles.nacos.namespace> <profiles.nacos.namespace>smart-gov</profiles.nacos.namespace>
<profiles.log.path>/home/mortals/app/logs</profiles.log.path> <profiles.log.path>/home/mortals/app/logs</profiles.log.path>
<profiles.filepath>/home/mortals/app/data</profiles.filepath>
<profiles.log.level>INFO</profiles.log.level> <profiles.log.level>INFO</profiles.log.level>
<package.environment>build</package.environment> <package.environment>yibin</package.environment>
<skipDeploy>false</skipDeploy> <skipDeploy>false</skipDeploy>
</properties> </properties>
</profile> </profile>
......
base-manager/src/test/java/com/mortals/httpclient/site/SiteController.http
View file @ 2976b64d
...@@ -89,7 +89,7 @@ POST {{baseUrl}}/site/getAreaSitesBySite ...@@ -89,7 +89,7 @@ POST {{baseUrl}}/site/getAreaSitesBySite
Content-Type: application/json Content-Type: application/json
{ {
"areaName":"宜宾市" "areaName":"雅安市"
} }
......
deploy.sh
View file @ 2976b64d
...@@ -31,7 +31,7 @@ NGINX_FILENAME="nginx-1.22.0.tar.gz" ...@@ -31,7 +31,7 @@ NGINX_FILENAME="nginx-1.22.0.tar.gz"
NGINX_SERVICE="${SERVICE_PATH}/${NGINX}.service" NGINX_SERVICE="${SERVICE_PATH}/${NGINX}.service"
NGINX_EXECPATH="${OPT_PATH}/${NGINX}" NGINX_EXECPATH="${OPT_PATH}/${NGINX}"
NGINX_CONF="/etc/nginx/nginx.conf" NGINX_CONF="/etc/nginx/nginx.conf"
NGINX_CONF_PATH="/etc/nginx/conf.d/" NGINX_CONF_PATH="/etc/nginx/conf.d"
# mysql变量 # mysql变量
MYSQL="mysql" MYSQL="mysql"
...@@ -59,7 +59,7 @@ REDIS_SERVICE="${SERVICE_PATH}/${REDIS}.service" ...@@ -59,7 +59,7 @@ REDIS_SERVICE="${SERVICE_PATH}/${REDIS}.service"
REDIS_EXECPATH="${OPT_PATH}/${REDIS}" REDIS_EXECPATH="${OPT_PATH}/${REDIS}"
REDIS_HOST="127.0.0.1" REDIS_HOST="127.0.0.1"
REDIS_PORT="6379" REDIS_PORT="6379"
REDIS_PASSWORD="12345678" REDIS_PASSWORD="hotel@2020"
CDATE=$(date "+%Y-%m-%d") CDATE=$(date "+%Y-%m-%d")
CTIME=$(date "+%H-%M-%S") CTIME=$(date "+%H-%M-%S")
...@@ -76,7 +76,7 @@ SMART_GATEWAY_SERVICE="${SERVICE_PATH}/smart-gateway.service" ...@@ -76,7 +76,7 @@ SMART_GATEWAY_SERVICE="${SERVICE_PATH}/smart-gateway.service"
SMART_GATEWAY_EXECPATH="${PUBLISH_PATH}/smart-gateway" SMART_GATEWAY_EXECPATH="${PUBLISH_PATH}/smart-gateway"
# 门户工程变量 # 门户工程变量
SMART_PORTAL_PLATFORM="smart-portal-platform" SMART_PORTAL_PLATFORM="portal-manager"
SMART_PORTAL_PLATFORM_FILENAME="${SMART_PORTAL_PLATFORM}.tar.gz" SMART_PORTAL_PLATFORM_FILENAME="${SMART_PORTAL_PLATFORM}.tar.gz"
SMART_PORTAL_PLATFORM_UI_FILENAME="${SMART_PORTAL_PLATFORM}-ui.tar.gz" SMART_PORTAL_PLATFORM_UI_FILENAME="${SMART_PORTAL_PLATFORM}-ui.tar.gz"
SMART_PORTAL_PLATFORM_SERVICE="${SERVICE_PATH}/${SMART_PORTAL_PLATFORM}.service" SMART_PORTAL_PLATFORM_SERVICE="${SERVICE_PATH}/${SMART_PORTAL_PLATFORM}.service"
...@@ -84,7 +84,7 @@ SMART_PORTAL_PLATFORM_EXECPATH="${PUBLISH_PATH}/${SMART_PORTAL_PLATFORM}" ...@@ -84,7 +84,7 @@ SMART_PORTAL_PLATFORM_EXECPATH="${PUBLISH_PATH}/${SMART_PORTAL_PLATFORM}"
SMART_PORTAL_PLATFORM_UI_EXECPATH="${PUBLISH_PATH}/${SMART_PORTAL_PLATFORM}-ui" SMART_PORTAL_PLATFORM_UI_EXECPATH="${PUBLISH_PATH}/${SMART_PORTAL_PLATFORM}-ui"
# 基础工程变量 # 基础工程变量
SMART_BASE_PLATFORM="smart-base-platform" SMART_BASE_PLATFORM="base-manager"
SMART_BASE_PLATFORM_FILENAME="${SMART_BASE_PLATFORM}.tar.gz" SMART_BASE_PLATFORM_FILENAME="${SMART_BASE_PLATFORM}.tar.gz"
SMART_BASE_PLATFORM_UI_FILENAME="${SMART_BASE_PLATFORM}-ui.tar.gz" SMART_BASE_PLATFORM_UI_FILENAME="${SMART_BASE_PLATFORM}-ui.tar.gz"
SMART_BASE_PLATFORM_SERVICE="${SERVICE_PATH}/${SMART_BASE_PLATFORM}.service" SMART_BASE_PLATFORM_SERVICE="${SERVICE_PATH}/${SMART_BASE_PLATFORM}.service"
...@@ -144,7 +144,7 @@ setup_java() { ...@@ -144,7 +144,7 @@ setup_java() {
system_version=$(unix_is_centos) system_version=$(unix_is_centos)
if [[ ${system_version} == "centos" ]]; then if [[ ${system_version} == "centos" ]]; then
writelog "centos java clear" writelog "centos java clear"
# yum -y remove java-*-openjdk* #卸载centos中的openjdk # yum -y remove java-*-openjdk* #卸载centos中的openjdk
#yum -y remove tzdata-java.noarch #yum -y remove tzdata-java.noarch
else else
writelog "ubuntu java clear" writelog "ubuntu java clear"
...@@ -225,17 +225,17 @@ setup_mysql() { ...@@ -225,17 +225,17 @@ setup_mysql() {
groupadd mysql groupadd mysql
useradd -r -g mysql mysql useradd -r -g mysql mysql
system_version=$(unix_is_centos) system_version=$(unix_is_centos)
if [[ ${system_version} == "centos" ]]; then if [[ ${system_version} == "centos" ]]; then
writelog "centos" writelog "centos"
yum -y install libncurses* yum -y install libncurses*
# yum -y remove java-*-openjdk* #卸载centos中的openjdk # yum -y remove java-*-openjdk* #卸载centos中的openjdk
#yum -y remove tzdata-java.noarch #yum -y remove tzdata-java.noarch
else else
writelog "ubuntu" writelog "ubuntu"
apt -y install libncurses* apt -y install libncurses*
#apt-get purge openjdk* #apt-get purge openjdk*
#apt-get purge icedtea-* openjdk-* #apt-get purge icedtea-* openjdk-*
fi fi
writelog "exccmd tar -zvxf ${BASEDIR}/soft/${MYSQL}/${MYSQL_CENTOS_FILENAME} -C ${MYSQL_EXECPATH} --strip-components 1" writelog "exccmd tar -zvxf ${BASEDIR}/soft/${MYSQL}/${MYSQL_CENTOS_FILENAME} -C ${MYSQL_EXECPATH} --strip-components 1"
tar -zvxf ${BASEDIR}/soft/${MYSQL}/${MYSQL_CENTOS_FILENAME} -C ${MYSQL_EXECPATH} --strip-components 1 tar -zvxf ${BASEDIR}/soft/${MYSQL}/${MYSQL_CENTOS_FILENAME} -C ${MYSQL_EXECPATH} --strip-components 1
cd ${MYSQL_EXECPATH} cd ${MYSQL_EXECPATH}
...@@ -327,11 +327,12 @@ setup_nginx() { ...@@ -327,11 +327,12 @@ setup_nginx() {
else else
writelog "ubuntu nginx clear" writelog "ubuntu nginx clear"
apt-get purge nginx* apt-get purge nginx*
apt-get -y install build-essential openssl libssl-dev libpcre3 libpcre3-dev zlib1g zlib1g-dev apt-get -y install build-essential openssl libssl-dev libpcre3 libpcre3-dev zlib1g zlib1g-dev
fi fi
rm -rf ${NGINX_EXECPATH} rm -rf ${NGINX_EXECPATH}
mkdir -p ${NGINX_EXECPATH} mkdir -p ${NGINX_EXECPATH}
mkdir -p ${NGINX_CONF_PATH}
writelog "解压nginx:tar -zvxf ${BASEDIR}/soft/${NGINX}/${NGINX_FILENAME} -C ${NGINX_EXECPATH} --strip-components 1" writelog "解压nginx:tar -zvxf ${BASEDIR}/soft/${NGINX}/${NGINX_FILENAME} -C ${NGINX_EXECPATH} --strip-components 1"
tar -zvxf ${BASEDIR}/soft/${NGINX}/${NGINX_FILENAME} -C ${NGINX_EXECPATH} --strip-components 1 tar -zvxf ${BASEDIR}/soft/${NGINX}/${NGINX_FILENAME} -C ${NGINX_EXECPATH} --strip-components 1
cd ${NGINX_EXECPATH} cd ${NGINX_EXECPATH}
...@@ -531,7 +532,8 @@ smart_base_platform_deploy() { ...@@ -531,7 +532,8 @@ smart_base_platform_deploy() {
mysql -h${MYSQL_HOST} -P${MYSQL_PORT} -u${MYSQL_USER} -p${MYSQL_PASSWORD} <${SMART_BASE_PLATFORM_EXECPATH}/db/menu.sql mysql -h${MYSQL_HOST} -P${MYSQL_PORT} -u${MYSQL_USER} -p${MYSQL_PASSWORD} <${SMART_BASE_PLATFORM_EXECPATH}/db/menu.sql
mysql -h${MYSQL_HOST} -P${MYSQL_PORT} -u${MYSQL_USER} -p${MYSQL_PASSWORD} <${SMART_BASE_PLATFORM_EXECPATH}/db/params.sql mysql -h${MYSQL_HOST} -P${MYSQL_PORT} -u${MYSQL_USER} -p${MYSQL_PASSWORD} <${SMART_BASE_PLATFORM_EXECPATH}/db/params.sql
mysql -h${MYSQL_HOST} -P${MYSQL_PORT} -u${MYSQL_USER} -p${MYSQL_PASSWORD} <${SMART_BASE_PLATFORM_EXECPATH}/db/init_area_data.sql mysql -h${MYSQL_HOST} -P${MYSQL_PORT} -u${MYSQL_USER} -p${MYSQL_PASSWORD} <${SMART_BASE_PLATFORM_EXECPATH}/db/init_area_data.sql
mysql -h${MYSQL_HOST} -P${MYSQL_PORT} -u${MYSQL_USER} -p${MYSQL_PASSWORD} <${SMART_BASE_PLATFORM_EXECPATH}/db/init_matter_data.sql mysql -h${MYSQL_HOST} -P${MYSQL_PORT} -u${MYSQL_USER} -p${MYSQL_PASSWORD} <${SMART_BASE_PLATFORM_EXECPATH}/db/init_base_area_data.sql
# mysql -h${MYSQL_HOST} -P${MYSQL_PORT} -u${MYSQL_USER} -p${MYSQL_PASSWORD} <${SMART_BASE_PLATFORM_EXECPATH}/db/init_matter_data.sql
build_service ${SMART_BASE_PLATFORM} ${SMART_BASE_PLATFORM_SERVICE} ${SMART_BASE_PLATFORM_EXECPATH} build_service ${SMART_BASE_PLATFORM} ${SMART_BASE_PLATFORM_SERVICE} ${SMART_BASE_PLATFORM_EXECPATH}
...@@ -690,6 +692,33 @@ function submenu() { #显示子菜单 ...@@ -690,6 +692,33 @@ function submenu() { #显示子菜单
eof eof
} }
function submenu1() { #显示子菜单
cat <<eof
*************************************
MENU
1.nacos部署
2.网关服务部署
3.门户服务部署
4.基础服务部署
5.设备管理部署
6.日志管理部署
7.全部部署
0.返回
*************************************
eof
}
function num() { #选项 function num() { #选项
read -p "请输入您需要操作的项目: " number read -p "请输入您需要操作的项目: " number
case $number in case $number in
...@@ -701,9 +730,13 @@ function num() { #选项 ...@@ -701,9 +730,13 @@ function num() { #选项
done done
;; ;;
2) 2)
stopApps while true; do
project_deploy submenu1
subnum1
done
;; ;;
# project_deploy
# ;;
3) 3)
stopApps stopApps
;; ;;
...@@ -755,6 +788,41 @@ function subnum() { #选项 ...@@ -755,6 +788,41 @@ function subnum() { #选项
esac esac
} }
function subnum1() { #选项
read -p "请输入您需要部署的服务: " number
case $number in
1)
nacos_deploy
;;
2)
smart_gateway_deploy
;;
3)
smart_portal_platform_deploy
;;
4)
smart_base_platform_deploy
;;
5)
device_platform_deploy
;;
6)
log_platform_deploy
;;
7)
project_deploy
;;
0)
while true; do
menu
num
done
;;
esac
}
#主函数 #主函数
main() { main() {
if [ -f ${LOCK_FILE} ]; then if [ -f ${LOCK_FILE} ]; then
......
portal-manager-ui/admin/.env.production
View file @ 2976b64d
# 生产环境配置 # 生产环境配置
NODE_ENV = production NODE_ENV = production
VUE_APP_API_BASE_URL=http://192.168.0.98:11078/zwfw VUE_APP_API_BASE_URL=http://192.168.2.144:11078/zwfw
portal-manager-ui/admin/.env.yibin
View file @ 2976b64d
#宜宾环境 #宜宾环境
NODE_ENV = "yibin" NODE_ENV = "production"
VUE_APP_API_BASE_URL=http://192.168.2.144:11078 VUE_APP_API_BASE_URL=http://192.168.2.144:11078
\ No newline at end of file
portal-manager-ui/admin/package-lock.json
View file @ 2976b64d
This diff is collapsed.
portal-manager-ui/admin/package.json
View file @ 2976b64d
...@@ -32,6 +32,8 @@ ...@@ -32,6 +32,8 @@
"@vue/cli-plugin-router": "~5.0.0", "@vue/cli-plugin-router": "~5.0.0",
"@vue/cli-plugin-vuex": "~5.0.0", "@vue/cli-plugin-vuex": "~5.0.0",
"@vue/cli-service": "~5.0.0", "@vue/cli-service": "~5.0.0",
"browserslist": "^4.21.4",
"caniuse-lite": "^1.0.30001442",
"less": "^4.0.0", "less": "^4.0.0",
"less-loader": "^8.0.0", "less-loader": "^8.0.0",
"postcss": "^8.4.12", "postcss": "^8.4.12",
......
portal-manager-ui/admin/src/views/signIn/signIn.vue
View file @ 2976b64d
...@@ -125,7 +125,7 @@ export default { ...@@ -125,7 +125,7 @@ export default {
margin-bottom: 5px; margin-bottom: 5px;
margin-top: 8px; margin-top: 8px;
} }
:deep(.ant-col-offset-4) { /deep/.ant-col-offset-4 {
width: 100%; width: 100%;
margin: auto; margin: auto;
} }
...@@ -133,7 +133,7 @@ export default { ...@@ -133,7 +133,7 @@ export default {
// .backstage { // .backstage {
// margin-right: 30px; // margin-right: 30px;
// } // }
:deep(.ant-form-item-control) { /deep/.ant-form-item-control {
width: 420px !important; width: 420px !important;
margin: auto; margin: auto;
......
portal-manager-ui/admin/yarn.lock
View file @ 2976b64d
This diff is collapsed.
portal-manager/db/menu.sql
View file @ 2976b64d
This diff is collapsed.
portal-manager/pom.xml
View file @ 2976b64d
...@@ -74,14 +74,14 @@ ...@@ -74,14 +74,14 @@
<profiles.publish.path>/home/publish</profiles.publish.path> <profiles.publish.path>/home/publish</profiles.publish.path>
<profiles.rabbitmq.host>127.0.0.1</profiles.rabbitmq.host> <profiles.rabbitmq.host>127.0.0.1</profiles.rabbitmq.host>
<profiles.rabbitmq.port>5672</profiles.rabbitmq.port> <profiles.rabbitmq.port>5672</profiles.rabbitmq.port>
<profiles.rabbitmq.username>root_mq</profiles.rabbitmq.username> <profiles.rabbitmq.username>taxi_mq</profiles.rabbitmq.username>
<profiles.rabbitmq.password>xhx@2022</profiles.rabbitmq.password> <profiles.rabbitmq.password>admin@2020</profiles.rabbitmq.password>
<profiles.rabbitmq.virtualhost>/</profiles.rabbitmq.virtualhost> <profiles.rabbitmq.virtualhost>/</profiles.rabbitmq.virtualhost>
<profiles.nacos.server-addr>127.0.0.1:8848</profiles.nacos.server-addr> <profiles.nacos.server-addr>127.0.0.1:8848</profiles.nacos.server-addr>
<profiles.nacos.group>DEFAULT_GROUP</profiles.nacos.group> <profiles.nacos.group>DEFAULT_GROUP</profiles.nacos.group>
<profiles.nacos.namespace>smart-gov</profiles.nacos.namespace> <profiles.nacos.namespace>smart-gov</profiles.nacos.namespace>
<profiles.log.level>INFO</profiles.log.level> <profiles.log.level>INFO</profiles.log.level>
<profiles.log.path>/mortals/app/logs</profiles.log.path> <profiles.log.path>/home/mortals/app/logs</profiles.log.path>
<package.environment>build</package.environment> <package.environment>build</package.environment>
<skipDeploy>false</skipDeploy> <skipDeploy>false</skipDeploy>
</properties> </properties>
...@@ -107,7 +107,7 @@ ...@@ -107,7 +107,7 @@
<profiles.nacos.namespace>smart-gov</profiles.nacos.namespace> <profiles.nacos.namespace>smart-gov</profiles.nacos.namespace>
<profiles.log.level>INFO</profiles.log.level> <profiles.log.level>INFO</profiles.log.level>
<profiles.log.path>/mortals/app/logs</profiles.log.path> <profiles.log.path>/mortals/app/logs</profiles.log.path>
<package.environment>build</package.environment> <package.environment>yibin</package.environment>
<skipDeploy>false</skipDeploy> <skipDeploy>false</skipDeploy>
</properties> </properties>
</profile> </profile>
......
smart-gateway/pom.xml
View file @ 2976b64d
...@@ -90,8 +90,8 @@ ...@@ -90,8 +90,8 @@
<profiles.nginx.port>11078</profiles.nginx.port> <profiles.nginx.port>11078</profiles.nginx.port>
<profiles.rabbitmq.host>127.0.0.1</profiles.rabbitmq.host> <profiles.rabbitmq.host>127.0.0.1</profiles.rabbitmq.host>
<profiles.rabbitmq.port>5672</profiles.rabbitmq.port> <profiles.rabbitmq.port>5672</profiles.rabbitmq.port>
<profiles.rabbitmq.username>root</profiles.rabbitmq.username> <profiles.rabbitmq.username>taxi_mq</profiles.rabbitmq.username>
<profiles.rabbitmq.password>xhx@2022</profiles.rabbitmq.password> <profiles.rabbitmq.password>admin@2020</profiles.rabbitmq.password>
<profiles.rabbitmq.virtualhost>/</profiles.rabbitmq.virtualhost> <profiles.rabbitmq.virtualhost>/</profiles.rabbitmq.virtualhost>
<profiles.nacos.server-addr>127.0.0.1:8848</profiles.nacos.server-addr> <profiles.nacos.server-addr>127.0.0.1:8848</profiles.nacos.server-addr>
<profiles.nacos.group>DEFAULT_GROUP</profiles.nacos.group> <profiles.nacos.group>DEFAULT_GROUP</profiles.nacos.group>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment