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

base-manager/pom.xml

@@ -107,6 +107,29 @@
             </properties>
         </profile>
 
+        <profile>
+            <id>sngx</id>
+            <properties>
+                <profiles.active>sngx</profiles.active>
+                <profiles.server.path>/base</profiles.server.path>
+                <profiles.server.port>17211</profiles.server.port>
+                <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>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>/mortals/app/data</profiles.filepath>
+                <profiles.log.level>INFO</profiles.log.level>
+                <package.environment>yibin</package.environment>
+                <skipUi>false</skipUi>
+            </properties>
+        </profile>
+
     </profiles>
 
     <dependencies>

base-manager/src/main/java/com/mortals/xhx/base/framework/config/MybatisConfiguration.java

@@ -12,7 +12,6 @@ import org.springframework.context.annotation.Configuration;
 import javax.sql.DataSource;
 
 @Configuration
-//@AutoConfigureAfter(DataSourceAutoConfiguration.class)
 public class MybatisConfiguration extends AbstractMybatisConfiguration {
     private static Log logger = LogFactory.getLog(MybatisConfiguration.class);
 

base-manager/src/main/java/com/mortals/xhx/busiz/web/AlarmWebApiController.java

+package com.mortals.xhx.busiz.web;
+
+import cn.hutool.core.codec.Base64;
+import com.alibaba.fastjson.JSON;
+import com.mortals.framework.annotation.UnAuth;
+import com.mortals.framework.common.Rest;
+import com.mortals.framework.model.Context;
+import com.mortals.framework.model.PageInfo;
+import com.mortals.framework.model.Result;
+import com.mortals.framework.web.BaseJsonBodyController;
+import com.mortals.xhx.module.matter.model.MatterQuery;
+import com.mortals.xhx.module.matter.model.vo.MatterInfo;
+import com.mortals.xhx.module.matter.service.MatterService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.http.HttpResponse;
+import org.apache.http.client.CookieStore;
+import org.apache.http.client.HttpClient;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.impl.client.BasicCookieStore;
+import org.apache.http.impl.client.HttpClientBuilder;
+import org.apache.http.util.EntityUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.ObjectUtils;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import static com.mortals.framework.ap.SysConstains.MESSAGE_INFO;
+import static com.mortals.framework.ap.SysConstains.PAGEINFO_KEY;
+
+/**
+ * promethos 告警信息接收
+ *
+ * @author: zxfei
+ * @date: 2023/8/7 9:44
+ */
+@RestController
+@Slf4j
+@RequestMapping("alarm")
+public class AlarmWebApiController extends BaseJsonBodyController {
+
+
+    @PostMapping(value = "body")
+    @UnAuth
+    public Rest<Map<String, String>> receiveAlarmBody(@RequestBody String json) {
+        log.info("请求告警信息:{}", json);
+
+        try {
+
+        } catch (Exception e) {
+            log.error("异常", e);
+        }
+        return Rest.ok();
+    }
+
+
+}

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

@@ -3,6 +3,8 @@ package com.mortals.xhx.module.workman.model.vo;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.annotation.JSONField;
 import com.mortals.framework.annotation.Excel;
+import com.mortals.framework.annotation.desensitization.IdCardDesensitize;
+import com.mortals.framework.annotation.desensitization.MobileDesensitize;
 import com.mortals.framework.model.BaseEntityLong;
 import com.mortals.xhx.module.workman.model.WorkmanEntity;
 import com.mortals.xhx.module.workman.model.WorkmanQuery;
@@ -39,6 +41,16 @@ public class WorkmanVo extends BaseEntityLong {
 
     /** AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4) */
     private List<WorkmanQuery> andConditionList;
+    /**
+     * 身份证
+     */
+    @IdCardDesensitize
+    private String idCard;
+    /**
+     * 手机
+     */
+    @MobileDesensitize
+    private String mobile;
 
     public static void main(String[] args) {
         WorkmanEntity workmanEntity = new WorkmanEntity();

base-manager/src/test/java/com/mortals/httpclient/dept/DeptController.http

@@ -3,7 +3,7 @@
 POST {{baseUrl}}/dept/list
 Content-Type: application/json
 
-{"siteId":1,"page":"1","size":"-1","orderColList":[{"colName":"sort","sortKind":"desc"}]}
+{"siteId":1,"page":"1","size":"-1","orderColList":[{"colName":"sort","sortKind":"asc"}]}
 
 
 ###部门更新与保存

deploy.sh

 #!/bin/bash
 #Shell 环境
-SHELL_NAME=$0
+SHELL_NAME=deploy
 BASEDIR=$(dirname $0)
 BASEDIR=$( (
   cd "$BASEDIR"
@@ -8,7 +8,7 @@ BASEDIR=$( (
 ))
 SHELL_LOG="${BASEDIR}/${SHELL_NAME}.log"
 
-OPT_PATH="/usr/local"
+OPT_PATH="/home/usr/local"
 PUBLISH_PATH="/home/publish"
 LOCK_FILE="/tmp/deploy.lock"
 SERVICE_PATH="/usr/lib/systemd/system"
@@ -284,7 +284,7 @@ socket=/tmp/mysql.sock
   #service mysql restart
 
   writelog $MYSQL_SERVICE
-  echo"
+  echo "
 [Unit]
 Description=MySQL Server
 After=network.target
@@ -300,7 +300,7 @@ ExecReload= /etc/init.d/mysql restart
 LimitNOFILE = 5000
 [Install]
 WantedBy=multi-user.target
-  ">${MYSQL_SERVICE}
+  " >${MYSQL_SERVICE}
 
   systemctl enable mysql
   systemctl daemon-reload
@@ -369,7 +369,7 @@ setup_nginx() {
   cd ${NGINX_EXECPATH}
 
   #./configure --prefix=${NGINX_EXECPATH} --conf-path=${NGINX_CONF} --with-pcre=/home/pcre-8.45
-  ./configure --prefix=${NGINX_EXECPATH} --conf-path=${NGINX_CONF}
+  ./configure --prefix=${NGINX_EXECPATH} --conf-path=${NGINX_CONF} --with-http_stub_status_module --with-http_ssl_module
   writelog "nginx make start"
   make
   make install
@@ -395,7 +395,9 @@ setup_nginx() {
   systemctl daemon-reload
   systemctl start ${NGINX}
 
-  ln -s /usr/local/nginx/sbin/nginx /usr/sbin/
+  rm -f /usr/sbin/nginx
+
+  ln -s ${NGINX_EXECPATH}/sbin/nginx /usr/sbin/nginx
 
   writelog "setup nginx finish"
 

portal-manager/pom.xml

@@ -96,7 +96,7 @@
 				<profiles.log.level>INFO</profiles.log.level>
 				<profiles.log.path>/home/mortals/app/logs</profiles.log.path>
 				<package.environment>build</package.environment>
-				<skipUi>true</skipUi>
+				<skipUi>false</skipUi>
 			</properties>
 		</profile>
 		<profile>
@@ -120,6 +120,27 @@
 			</properties>
 		</profile>
 
+		<profile>
+			<id>sngx</id>
+			<properties>
+				<profiles.active>sngx</profiles.active>
+				<profiles.server.path>/zwfw</profiles.server.path>
+				<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>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>/home/mortals/app/logs</profiles.log.path>
+				<package.environment>yibin</package.environment>
+				<skipUi>false</skipUi>
+			</properties>
+		</profile>
+
 	</profiles>
 	<properties>
 	</properties>

smart-gateway/pom.xml

@@ -123,6 +123,28 @@
             </properties>
         </profile>
 
+
+        <profile>
+            <id>sngx</id>
+            <properties>
+                <profiles.active>sngx</profiles.active>
+                <profiles.server.ip>127.0.0.1</profiles.server.ip>
+                <profiles.server.port>17214</profiles.server.port>
+                <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>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>/home/mortals/app/logs</profiles.log.path>
+                <profiles.publish.path>/home/publish</profiles.publish.path>
+            </properties>
+        </profile>
+
     </profiles>
 
     <properties>