Merge branch 'master' of http://gitlab.scsmile.cn/zxf/smart_gov_platform

base-manager-ui/admin/.env.production

 #生产环境
 NODE_ENV = "production"
-VUE_APP_API_BASE_URL=http://192.168.0.251:11078
\ No newline at end of file
+VUE_APP_API_BASE_URL=http://192.168.0.98:11078
\ No newline at end of file

base-manager-ui/admin/.env.yibin

 #测试环境
-NODE_ENV = "yibin"
+NODE_ENV = "production"
 VUE_APP_API_BASE_URL=http://192.168.2.144:11078
\ No newline at end of file

base-manager-ui/admin/package.json

@@ -57,7 +57,9 @@
     "babel-eslint": "^10.1.0",
     "babel-plugin-transform-remove-console": "^6.9.4",
     "babel-polyfill": "^6.26.0",
+    "browserslist": "^4.21.4",
     "cache-loader": "^4.1.0",
+    "caniuse-lite": "^1.0.30001442",
     "compression-webpack-plugin": "^2.0.0",
     "deepmerge": "^4.2.2",
     "eslint": "^6.7.2",

base-manager-ui/admin/yarn.lock

@@ -2211,7 +2211,7 @@ ansi-styles@^4.1.0:
 
 ant-design-vue@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==
   dependencies:
     "@ant-design/icons" "^2.1.1"
@@ -2747,16 +2747,15 @@ browserify-zlib@^0.2.0:
   dependencies:
     pako "~1.0.5"
 
-browserslist@^4.0.0, browserslist@^4.12.0, browserslist@^4.8.5:
-  version "4.20.0"
-  resolved "https://registry.npmmirror.com/browserslist/-/browserslist-4.20.0.tgz"
-  integrity sha512-bnpOoa+DownbciXj0jVGENf8VYQnE2LNWomhYuCsMmmx9Jd9lwq0WXODuwpSsp8AVdKM2/HorrzxAfbKvWTByQ==
+browserslist@^4.0.0, browserslist@^4.12.0, browserslist@^4.21.4, browserslist@^4.8.5:
+  version "4.21.4"
+  resolved "https://registry.npmmirror.com/browserslist/-/browserslist-4.21.4.tgz"
+  integrity sha512-CBHJJdDmgjl3daYjN5Cp5kbTf1mUhZoS+beLklHIvkOWscs83YAhLlF3Wsh/lciQYAcbBJgTOD44VtG31ZM4Hw==
   dependencies:
-    caniuse-lite "^1.0.30001313"
-    electron-to-chromium "^1.4.76"
-    escalade "^3.1.1"
-    node-releases "^2.0.2"
-    picocolors "^1.0.0"
+    caniuse-lite "^1.0.30001400"
+    electron-to-chromium "^1.4.251"
+    node-releases "^2.0.6"
+    update-browserslist-db "^1.0.9"
 
 buffer-from@^1.0.0:
   version "1.1.1"
@@ -2988,10 +2987,10 @@ caniuse-api@^3.0.0:
     lodash.memoize "^4.1.2"
     lodash.uniq "^4.5.0"
 
-caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001313:
-  version "1.0.30001314"
-  resolved "https://registry.npmmirror.com/caniuse-lite/-/caniuse-lite-1.0.30001314.tgz"
-  integrity sha512-0zaSO+TnCHtHJIbpLroX7nsD+vYuOVjl3uzFbJO1wMVbuveJA0RK2WcQA9ZUIOiO0/ArMiMgHJLxfEZhQiC0kw==
+caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001400, caniuse-lite@^1.0.30001442:
+  version "1.0.30001442"
+  resolved "https://registry.npmmirror.com/caniuse-lite/-/caniuse-lite-1.0.30001442.tgz"
+  integrity sha512-239m03Pqy0hwxYPYR5JwOIxRJfLTWtle9FV8zosfV5pHg+/51uD4nxcUlM8+mWWGfwKtt8lJNHnD3cWw9VZ6ow==
 
 case-sensitive-paths-webpack-plugin@^2.3.0:
   version "2.3.0"
@@ -3068,7 +3067,7 @@ check-types@^8.0.3:
 
 china-area-data@^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==
 
 china-division@^2.5.0:
@@ -4475,14 +4474,14 @@ ejs@^2.6.1:
   resolved "https://registry.npm.taobao.org/ejs/download/ejs-2.7.4.tgz"
   integrity sha1-SGYSh1c9zFPjZsehrlLDoSDuybo=
 
-electron-to-chromium@^1.4.76:
-  version "1.4.77"
-  resolved "https://registry.npmmirror.com/electron-to-chromium/-/electron-to-chromium-1.4.77.tgz"
-  integrity sha512-fiDxw8mO9Ph1Z0bjX2sFTPpi0J0QkOiwOJF+5Q0J0baNc/F9lLePAvDPlnoxvbUYYMizqrKPeotRRkJ9LtxAew==
+electron-to-chromium@^1.4.251:
+  version "1.4.284"
+  resolved "https://registry.npmmirror.com/electron-to-chromium/-/electron-to-chromium-1.4.284.tgz"
+  integrity sha512-M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA==
 
 element-china-area-data@^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==
   dependencies:
     china-area-data "^5.0.1"
@@ -7119,7 +7118,7 @@ locate-path@^5.0.0:
 
 lodash-es@^4.17.15:
   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==
 
 lodash._reinterpolate@^3.0.0:
@@ -7761,10 +7760,10 @@ node-libs-browser@^2.2.1:
     util "^0.11.0"
     vm-browserify "^1.0.1"
 
-node-releases@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.npmmirror.com/node-releases/-/node-releases-2.0.2.tgz"
-  integrity sha512-XxYDdcQ6eKqp/YjI+tb2C5WM2LgjnZrfYg4vgQt49EK268b6gYCHsBLrK2qvJo4FmCtqmKezb0WZFK4fkrZNsg==
+node-releases@^2.0.6:
+  version "2.0.8"
+  resolved "https://registry.npmmirror.com/node-releases/-/node-releases-2.0.8.tgz"
+  integrity sha512-dFSmB8fFHEH/s81Xi+Y/15DQY6VHW81nXRj86EMSL3lmuTmK1e+aT4wrFCkTbm+gSwkw4KpX+rT/pMM2c1mF+A==
 
 nopt@1.0.10:
   version "1.0.10"
@@ -9019,7 +9018,7 @@ quill-delta@^3.6.2:
 
 quill-image-resize-module@^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==
   dependencies:
     lodash "^4.17.4"
@@ -9077,7 +9076,7 @@ raw-body@2.4.0:
 
 raw-loader@^0.5.1, raw-loader@~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==
 
 rc@^1.2.8:
@@ -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"
   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:
   version "4.1.0"
   resolved "https://registry.npm.taobao.org/update-notifier/download/update-notifier-4.1.0.tgz"

base-manager/db/init_area_data.sql

@@ -3,8 +3,8 @@ use `base-platform`;
 -- ----------------------------
 -- Table structure for mortals_sys_base_area
 -- ----------------------------
-DROP TABLE IF EXISTS `mortals_sys_base_area`;
-CREATE TABLE `mortals_sys_base_area`  (
+DROP TABLE IF EXISTS `mortals_sys_area`;
+CREATE TABLE `mortals_sys_area`  (
   `id` bigint(20) NOT NULL AUTO_INCREMENT 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 '区域名称',

base-manager/db/params.sql

@@ -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, '填单机', 'tdj', '填单机', 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

@@ -106,15 +106,16 @@
                 <profiles.publish.path>/home/publish</profiles.publish.path>
                 <profiles.rabbitmq.host>192.168.2.144</profiles.rabbitmq.host>
                 <profiles.rabbitmq.port>5672</profiles.rabbitmq.port>
-                <profiles.rabbitmq.username>root</profiles.rabbitmq.username>
-                <profiles.rabbitmq.password>xhx@2022</profiles.rabbitmq.password>
+                <profiles.rabbitmq.username>taxi_mq</profiles.rabbitmq.username>
+                <profiles.rabbitmq.password>admin@2020</profiles.rabbitmq.password>
                 <profiles.rabbitmq.virtualhost>/</profiles.rabbitmq.virtualhost>
                 <profiles.nacos.server-addr>127.0.0.1:8848</profiles.nacos.server-addr>
                 <profiles.nacos.group>DEFAULT_GROUP</profiles.nacos.group>
                 <profiles.nacos.namespace>smart-gov</profiles.nacos.namespace>
                 <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>
-                <package.environment>build</package.environment>
+                <package.environment>yibin</package.environment>
                 <skipDeploy>false</skipDeploy>
             </properties>
         </profile>

base-manager/src/main/java/com/mortals/xhx/module/model/model/vo/ModelVo.java

@@ -18,4 +18,7 @@ public class ModelVo extends BaseEntityLong {
     private Long siteId;
     /** 模块下包含的数据统计 */
     private List<ModelCensusEntity> censusList;
+
+    /** 是否admin 0否，1是*/
+    private Integer isAdmin;
 }
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/model/service/ModelService.java

@@ -32,5 +32,5 @@ public interface ModelService extends ICRUDService<ModelEntity,Long>{
      * @return
      * @throws AppException
      */
-    List<ModelEntity> getListBySiteId(Long siteId) throws AppException;
+    List<ModelEntity> getListBySiteId(Long siteId,Integer isAdmin) throws AppException;
 }
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/model/service/impl/ModelServiceImpl.java

@@ -50,7 +50,17 @@ public class ModelServiceImpl extends AbstractCRUDServiceImpl<ModelDao, ModelEnt
     }
 
     @Override
-    public List<ModelEntity> getListBySiteId(Long siteId) throws AppException {
+    public List<ModelEntity> getListBySiteId(Long siteId,Integer isAdmin) throws AppException {
+        if(isAdmin!=null&&isAdmin==1){
+            ModelQuery modelQuery = new ModelQuery();
+            modelQuery.setOrderColList(new ArrayList<OrderCol>() {
+                {
+                    add(new OrderCol("a.sort", OrderCol.ASCENDING));
+                }
+            });
+            List<ModelEntity> modelEntityList = this.find(modelQuery);
+            return modelEntityList;
+        }
         if(siteId==null || siteId==0){
             return Collections.emptyList();
         }

base-manager/src/main/java/com/mortals/xhx/module/model/web/ModelController.java

@@ -135,7 +135,7 @@ public class ModelController extends BaseCRUDJsonBodyMappingController<ModelServ
         String busiDesc = "查询" + this.getModuleDesc();
         int code=1;
         try {
-            List<ModelEntity> result = this.getService().getListBySiteId(query.getSiteId());
+            List<ModelEntity> result = this.getService().getListBySiteId(query.getSiteId(),query.getIsAdmin());
             model.put("data", result);
             model.put("message_info", busiDesc + "成功");
             this.recordSysLog(this.request, busiDesc + " 【成功】");

base-manager/src/test/java/com/mortals/httpclient/site/SiteController.http

@@ -89,7 +89,7 @@ POST {{baseUrl}}/site/getAreaSitesBySite
 Content-Type: application/json
 
 {
-  "areaName":"宜宾市"
+  "areaName":"雅安市"
 }
 
 

common-lib/src/main/java/com/mortals/xhx/common/pdu/ModelPdu.java

@@ -8,4 +8,6 @@ import java.util.List;
 public class ModelPdu {
     private List<Long> idList;
     private Long siteId;
+    /** 是否admin 0否，1是*/
+    private Integer isAdmin;
 }

deploy.sh

@@ -31,7 +31,7 @@ NGINX_FILENAME="nginx-1.22.0.tar.gz"
 NGINX_SERVICE="${SERVICE_PATH}/${NGINX}.service"
 NGINX_EXECPATH="${OPT_PATH}/${NGINX}"
 NGINX_CONF="/etc/nginx/nginx.conf"
-NGINX_CONF_PATH="/etc/nginx/conf.d/"
+NGINX_CONF_PATH="/etc/nginx/conf.d"
 
 # mysql变量
 MYSQL="mysql"
@@ -59,7 +59,7 @@ REDIS_SERVICE="${SERVICE_PATH}/${REDIS}.service"
 REDIS_EXECPATH="${OPT_PATH}/${REDIS}"
 REDIS_HOST="127.0.0.1"
 REDIS_PORT="6379"
-REDIS_PASSWORD="12345678"
+REDIS_PASSWORD="hotel@2020"
 
 CDATE=$(date "+%Y-%m-%d")
 CTIME=$(date "+%H-%M-%S")
@@ -76,7 +76,7 @@ SMART_GATEWAY_SERVICE="${SERVICE_PATH}/smart-gateway.service"
 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_UI_FILENAME="${SMART_PORTAL_PLATFORM}-ui.tar.gz"
 SMART_PORTAL_PLATFORM_SERVICE="${SERVICE_PATH}/${SMART_PORTAL_PLATFORM}.service"
@@ -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_BASE_PLATFORM="smart-base-platform"
+SMART_BASE_PLATFORM="base-manager"
 SMART_BASE_PLATFORM_FILENAME="${SMART_BASE_PLATFORM}.tar.gz"
 SMART_BASE_PLATFORM_UI_FILENAME="${SMART_BASE_PLATFORM}-ui.tar.gz"
 SMART_BASE_PLATFORM_SERVICE="${SERVICE_PATH}/${SMART_BASE_PLATFORM}.service"
@@ -144,7 +144,7 @@ setup_java() {
   system_version=$(unix_is_centos)
   if [[ ${system_version} == "centos" ]]; then
     writelog "centos java clear"
-   # yum -y remove java-*-openjdk* #卸载centos中的openjdk
+    # yum -y remove java-*-openjdk* #卸载centos中的openjdk
     #yum -y remove tzdata-java.noarch
   else
     writelog "ubuntu java clear"
@@ -225,17 +225,17 @@ setup_mysql() {
   groupadd mysql
   useradd -r -g mysql mysql
   system_version=$(unix_is_centos)
-    if [[ ${system_version} == "centos" ]]; then
-      writelog "centos"
-      yum -y install libncurses*
-     # yum -y remove java-*-openjdk* #卸载centos中的openjdk
-      #yum -y remove tzdata-java.noarch
-    else
-      writelog "ubuntu"
-      apt -y install libncurses*
-      #apt-get purge openjdk*
-      #apt-get purge icedtea-* openjdk-*
-    fi
+  if [[ ${system_version} == "centos" ]]; then
+    writelog "centos"
+    yum -y install libncurses*
+    # yum -y remove java-*-openjdk* #卸载centos中的openjdk
+    #yum -y remove tzdata-java.noarch
+  else
+    writelog "ubuntu"
+    apt -y install libncurses*
+    #apt-get purge openjdk*
+    #apt-get purge icedtea-* openjdk-*
+  fi
   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
   cd ${MYSQL_EXECPATH}
@@ -327,11 +327,12 @@ setup_nginx() {
   else
     writelog "ubuntu nginx clear"
     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
 
   rm -rf ${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"
   tar -zvxf ${BASEDIR}/soft/${NGINX}/${NGINX_FILENAME} -C ${NGINX_EXECPATH} --strip-components 1
   cd ${NGINX_EXECPATH}
@@ -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/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_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}
 
@@ -690,6 +692,33 @@ function submenu() { #显示子菜单
 eof
 }
 
+function submenu1() { #显示子菜单
+
+  cat <<eof
+ *************************************
+                 MENU
+
+             1.nacos部署
+
+             2.网关服务部署
+
+             3.门户服务部署
+
+             4.基础服务部署
+
+             5.设备管理部署
+
+             6.日志管理部署
+
+             7.全部部署
+
+             0.返回
+
+
+ *************************************
+eof
+}
+
 function num() { #选项
   read -p "请输入您需要操作的项目: " number
   case $number in
@@ -701,9 +730,13 @@ function num() { #选项
     done
     ;;
   2)
-    stopApps
-    project_deploy
+    while true; do
+      submenu1
+      subnum1
+    done
     ;;
+    #    project_deploy
+    #    ;;
   3)
     stopApps
     ;;
@@ -755,6 +788,41 @@ function subnum() { #选项
   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() {
   if [ -f ${LOCK_FILE} ]; then

portal-manager-ui/admin/.env.yibin

 #宜宾环境
-NODE_ENV = "yibin"
+NODE_ENV = "production"
 VUE_APP_API_BASE_URL=http://192.168.2.144:11078
\ No newline at end of file

portal-manager-ui/admin/package.json

@@ -32,6 +32,8 @@
     "@vue/cli-plugin-router": "~5.0.0",
     "@vue/cli-plugin-vuex": "~5.0.0",
     "@vue/cli-service": "~5.0.0",
+    "browserslist": "^4.21.4",
+    "caniuse-lite": "^1.0.30001442",
     "less": "^4.0.0",
     "less-loader": "^8.0.0",
     "postcss": "^8.4.12",

portal-manager/pom.xml

@@ -74,14 +74,14 @@
 				<profiles.publish.path>/home/publish</profiles.publish.path>
 				<profiles.rabbitmq.host>127.0.0.1</profiles.rabbitmq.host>
 				<profiles.rabbitmq.port>5672</profiles.rabbitmq.port>
-				<profiles.rabbitmq.username>root_mq</profiles.rabbitmq.username>
-				<profiles.rabbitmq.password>xhx@2022</profiles.rabbitmq.password>
+				<profiles.rabbitmq.username>taxi_mq</profiles.rabbitmq.username>
+				<profiles.rabbitmq.password>admin@2020</profiles.rabbitmq.password>
 				<profiles.rabbitmq.virtualhost>/</profiles.rabbitmq.virtualhost>
 				<profiles.nacos.server-addr>127.0.0.1:8848</profiles.nacos.server-addr>
 				<profiles.nacos.group>DEFAULT_GROUP</profiles.nacos.group>
 				<profiles.nacos.namespace>smart-gov</profiles.nacos.namespace>
 				<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>
 				<skipDeploy>false</skipDeploy>
 			</properties>
@@ -107,7 +107,7 @@
 				<profiles.nacos.namespace>smart-gov</profiles.nacos.namespace>
 				<profiles.log.level>INFO</profiles.log.level>
 				<profiles.log.path>/mortals/app/logs</profiles.log.path>
-				<package.environment>build</package.environment>
+				<package.environment>yibin</package.environment>
 				<skipDeploy>false</skipDeploy>
 			</properties>
 		</profile>

portal-manager/src/main/java/com/mortals/xhx/module/model/ModelController.java

@@ -76,21 +76,30 @@ public class ModelController extends BaseJsonBodyController {
         String busiDesc = "查询站点编排" ;
         int code=1;
         try {
+            if(this.getCurUser()==null){
+                throw new AppException("未登录或者登录过期");
+            }
             ModelPdu modelPdu = new ModelPdu();
             modelPdu.setSiteId(query.getSiteId());
+            if(this.getCurUser().getId()==1){
+                modelPdu.setIsAdmin(1);
+            }else {
+                modelPdu.setIsAdmin(0);
+            }
             //ApiResp<List<ModelFeignVO>> apiResp = apiModelFeign.getModelBySiteId(modelPdu);
             String resp = apiModelFeign.getModelBySiteId(modelPdu);
             ApiResp<JSONObject> apiResp = JSON.parseObject(resp, ApiResp.class);
             if (apiResp.getCode() != YesNoEnum.YES.getValue()) {
                 throw new AppException("获取站点列表信息失败：" + apiResp.getMsg());
             }
-            if(this.getCurUser()==null){
-                throw new AppException("未登录或者登录过期");
-            }
             Map<Long,Long> map = roleModelService.getModelIdsUserId(this.getCurUser().getId());
             List<ModelFeignVO> modelFeignVOList = JSONObject.parseArray(apiResp.getData().get("data").toString(),ModelFeignVO.class);
             List<ModelFeignVO> list = modelFeignVOList.stream().filter(item->map.containsKey(item.getId())).collect(Collectors.toList());
-            model.put("data", list);
+            if(this.getCurUser().getId()==1){
+                model.put("data", modelFeignVOList);
+            }else {
+                model.put("data", list);
+            }
             model.put("message_info", busiDesc + "成功");
             this.recordSysLog(this.request, busiDesc + " 【成功】");
         } catch (Exception var9) {

smart-gateway/pom.xml

@@ -90,8 +90,8 @@
                 <profiles.nginx.port>11078</profiles.nginx.port>
                 <profiles.rabbitmq.host>127.0.0.1</profiles.rabbitmq.host>
                 <profiles.rabbitmq.port>5672</profiles.rabbitmq.port>
-                <profiles.rabbitmq.username>root</profiles.rabbitmq.username>
-                <profiles.rabbitmq.password>xhx@2022</profiles.rabbitmq.password>
+                <profiles.rabbitmq.username>taxi_mq</profiles.rabbitmq.username>
+                <profiles.rabbitmq.password>admin@2020</profiles.rabbitmq.password>
                 <profiles.rabbitmq.virtualhost>/</profiles.rabbitmq.virtualhost>
                 <profiles.nacos.server-addr>127.0.0.1:8848</profiles.nacos.server-addr>
                 <profiles.nacos.group>DEFAULT_GROUP</profiles.nacos.group>

smart-gateway/src/main/java/com/mortals/xhx/base/framework/config/CrossInterceptor.java

@@ -11,7 +11,7 @@ import javax.servlet.http.HttpServletResponse;
  * @date: 2022/6/6 15:05
  * @description:添加跨域响应
  **/
-@Component
+//@Component
 public class CrossInterceptor extends HandlerInterceptorAdapter {
 
     @Override