后端发布前提交

lib/EmergencyBaseLib/EmergencyCommon/src/main/java/com/zdxt/common/util/IdCardCryptoUtil.java

@@ -32,7 +32,7 @@ public class IdCardCryptoUtil {
         String key = "VRJHzFqJpsSZhwnsKTWNspv_GZMxTWl-bgH6DyE9Ty0";
         System.out.println("====================== 示例 ======================");
         // 加密
-        String source_dec = "13823290422";
+        String source_dec = "18676981102";
         String enc = IdCardCryptoUtil.symmetricEncryptIdCard(key, source_dec);
         System.out.println(source_dec+" 加密后 : "+enc);
         // 解密

lib/EmergencyBaseLib/EmergencyCommon/src/main/java/com/zdxt/common/util/jasypt/JasyptUtils.java

@@ -50,9 +50,11 @@ public final class JasyptUtils {
     }
     public static void main(String[] args) {
          //加密
-         String s = encryptWithMD5("szsf@zfjd", "ATPfOhpnAVp6yBas7RU");
+         String s = encryptWithMD5("jdbc:mysql://10.76.108.1:15144/zfjd?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8", "ATPfOhpnAVp6yBas7RU");
          System.out.println(s);
-        String channelcs1 = decryptWithMD5("+bxT7W35PF0k/5FZBYV0uwFLN+I9kZsF", "ATPfOhpnAVp6yBas7RU");
+        String channelcs1 = decryptWithMD5("d4ohneeRrbUb1DsUxGfVs5K7/ZGrnDmSVMQOxx0GIcb0ZWzyCq9aC7CH4aBfwlq3T9G8BLy7cDfTO+IE4uPcstIfQmdHtOlqKxTbBAVxJOUArE3FykMxHzb/NGQ7k4ahHIt+QzH0HPagJACm5B3Wgz8oUZXwq9pZlHmmAG8994JaPIgMhIsA2Lxdnaw/LHBiGkq+FpE7j5TIcItow1HcGw==", "ATPfOhpnAVp6yBas7RU");
+        String channelcs2 = decryptWithMD5("jGDVr5PtJpE/xa9FyHzmV2PhFrtctWjETGP5lrUlOyZ68APa81+jbQYA9RNKMI/dldAm7xxTQian8370eQqlYSAyoQV9EYlhsK3MgJkn4+OmnfBNmg227+/hizsmt1swxyW2uQbdlhzw6QaXYJ175Rjtlq1yVx+NOiamEoeSO4hzHWqxKTJT/y19fHg6QTuQc3r+PEsAFQp503HsvC5lgA==", "ATPfOhpnAVp6yBas7RU");
         System.out.println(channelcs1);
+        System.out.println(channelcs2);
     }
 }

lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/external/company/OutEnforcementRegistrationController.java

@@ -15,7 +15,7 @@ import com.zdxt.common.util.CommonUtil;
 import com.zdxt.common.util.StringUtils;
 import com.zdxt.common.util.TableDataInfo;
 import io.swagger.annotations.Api;
-import io.swagger.v3.oas.annotations.tags.Tag;
+//import io.swagger.v3.oas.annotations.tags.Tag;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -35,7 +35,7 @@ import java.util.*;
  * @author chenrui
  * @date 2024-02-23
  */
-@Tag(name = "外部接口", description = "执法端-执法登记")
+//@Tag(name = "外部接口", description = "执法端-执法登记")
 @Controller
 @RequestMapping("/external/code/registration")
 public class OutEnforcementRegistrationController extends BaseController

lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/external/company/OutEnterpriseComplaintController.java

@@ -15,7 +15,7 @@ import com.zdxt.common.controller.BaseController;
 import com.zdxt.common.util.StringUtils;
 import com.zdxt.common.util.TableDataInfo;
 import com.zdxt.common.zdxtFile.ZdxtFileCommon;
-import io.swagger.v3.oas.annotations.tags.Tag;
+//import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
@@ -28,7 +28,7 @@ import java.util.*;
  * @author chenrui
  * @date 2024-02-23
  */
-@Tag(name = "外部接口", description = "企业执法-在线投诉")
+//@Tag(name = "外部接口", description = "企业执法-在线投诉")
 @Controller
 @RequestMapping("/external/code/complaint")
 public class OutEnterpriseComplaintController extends BaseController {

lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/external/company/OutEnterpriseEvaluateController.java

@@ -5,7 +5,7 @@ import com.zdxt.code.service.IEnterpriseEvaluateService;
 import com.zdxt.common.ZDResponse;
 import com.zdxt.common.controller.BaseController;
 import com.zdxt.common.util.TableDataInfo;
-import io.swagger.v3.oas.annotations.tags.Tag;
+//import io.swagger.v3.oas.annotations.tags.Tag;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -23,7 +23,7 @@ import java.util.List;
  */
 @Controller
 @RequestMapping("/external/evaluate")
-@Tag(name = "外部接口", description = "企业端-执法评价")
+//@Tag(name = "外部接口", description = "企业端-执法评价")
 public class OutEnterpriseEvaluateController extends BaseController
 {
     private String prefix = "project/code/evaluate";

lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/external/company/OutEnterpriseLawEnforcementController.java

@@ -7,7 +7,7 @@ import com.zdxt.code.service.IEnterpriseLawEnforcementService;
 import com.zdxt.common.ZDResponse;
 import com.zdxt.common.controller.BaseController;
 import com.zdxt.common.util.TableDataInfo;
-import io.swagger.v3.oas.annotations.tags.Tag;
+//import io.swagger.v3.oas.annotations.tags.Tag;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -24,7 +24,7 @@ import java.util.List;
  * @author chenrui
  * @date 2024-02-21
  */
-@Tag(name = "外部接口", description = "企业端-企业端-执法部门预约记")
+//@Tag(name = "外部接口", description = "企业端-企业端-执法部门预约记")
 @Controller
 @RequestMapping("/external/code/enforcement")
 public class OutEnterpriseLawEnforcementController extends BaseController

lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/framework/config/CorsFilter.java

@@ -32,7 +32,7 @@ public class CorsFilter implements Filter {
     public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException {
         //配置可信域名
         String[]  authhosts = {"http://10.132.108.3:85","http://jdm.szssfj.cn","http://localhost:85","http://192.168.31.196:3301","http://172.16.20.74:85",
-                "http://localhost:3301","http://10.132.108.3:81","http://10.132.108.3:85", "http://192.168.1.130:3301", "http://192.168.110.139:3301"};
+                "http://localhost:3301","http://10.132.108.3:81","http://10.132.108.3:85", "http://192.168.1.130:3301", "http://172.16.20.74:3301", "http://10.132.108.1", "http://10.132.108.6"};
         String authost = "";
         HttpServletRequest httprequest = (HttpServletRequest) request;
         String origin = httprequest.getHeader("Origin");

lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/application-dev.yml

@@ -33,7 +33,7 @@ xxl:
 
 
 allowed:
-  servernames: 10.76.108.1,10.76.108.3,10.132.108.3,jdm.szssfj.cn,58.250.157.161,127.0.0.1,localhost,192.168.110.35,192.168.110.41,172.16.20.74
+  servernames: 10.76.108.1,10.76.108.3,10.132.108.3,jdm.szssfj.cn,58.250.157.161,127.0.0.1,localhost,172.16.20.74
 
 excel:
   export: true

lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/application-druidPro.yml

@@ -6,7 +6,8 @@ spring:
     druid:
       # 主库数据源
       master:
-        url: ENC(jGDVr5PtJpE/xa9FyHzmV2PhFrtctWjETGP5lrUlOyZ68APa81+jbQYA9RNKMI/dldAm7xxTQian8370eQqlYSAyoQV9EYlhsK3MgJkn4+OmnfBNmg227+/hizsmt1swxyW2uQbdlhzw6QaXYJ175Rjtlq1yVx+NOiamEoeSO4hzHWqxKTJT/y19fHg6QTuQc3r+PEsAFQp503HsvC5lgA==)
+        url: ENC(d4ohneeRrbUb1DsUxGfVs5K7/ZGrnDmSVMQOxx0GIcb0ZWzyCq9aC7CH4aBfwlq3T9G8BLy7cDfTO+IE4uPcstIfQmdHtOlqKxTbBAVxJOUArE3FykMxHzb/NGQ7k4ahHIt+QzH0HPagJACm5B3Wgz8oUZXwq9pZlHmmAG8994JaPIgMhIsA2Lxdnaw/LHBiGkq+FpE7j5TIcItow1HcGw==)
+#        url: ENC(jGDVr5PtJpE/xa9FyHzmV2PhFrtctWjETGP5lrUlOyZ68APa81+jbQYA9RNKMI/dldAm7xxTQian8370eQqlYSAyoQV9EYlhsK3MgJkn4+OmnfBNmg227+/hizsmt1swxyW2uQbdlhzw6QaXYJ175Rjtlq1yVx+NOiamEoeSO4hzHWqxKTJT/y19fHg6QTuQc3r+PEsAFQp503HsvC5lgA==)
         username: ENC(1rDSoCn95lOAhX0J5nVklg==)
         password: ENC(AQ64D6wCVRGllbBj0o6yd4NSrZLYj+4M)
 #        url: ENC(v3oHIZvpj5ZRTcLc41PnMXUVZbXK7dp+IKwsOlJ2bRUf5E5bagEjlB3qNwT7KiAnX3+ugTUeKWt1cVPh1iVLlQE1ELVNILu6k0X4/uH9ao53b4pLlyJsim67HozUikmKDQ/wDMxVUSkBW21g6jcKeEzXgSphxUQvPz/L8KJzzHJvkpDarGwYUZH+sV1VnSkHCHpPqW9wkbD/AN8K+iNiLw==)

lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/application-pro.yml

@@ -38,7 +38,7 @@ security:
 
 
 allowed:
-  servernames: 10.76.108.1,10.76.108.3,10.132.108.3,10.76.108.4,10.132.108.4,jdm.szssfj.cn,58.250.157.161,127.0.0.1,localhost,192.168.31.146
+  servernames: 10.132.108.1,10.132.108.6,10.76.108.1,10.76.108.3,10.132.108.3,10.76.108.4,10.132.108.4,jdm.szssfj.cn,58.250.157.161,127.0.0.1,localhost,192.168.31.146,192.168.236.84,192.168.168.110,192.168.11.120,61.144.224.125,10.189.1.153,61.144.224.146,192.168.6.253,61.144.224.92,61.144.224.40,61.144.224.41,61.144.224.42,61.144.224.43,192.168.129.145,192.168.129.146,192.168.129.147,192.168.129.148
 
 excel:
   export: true

lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/application-test.yml

@@ -33,7 +33,7 @@ xxl:
 
 
 allowed:
-  servernames: 10.76.108.1,10.76.108.3,10.132.108.3,jdm.szssfj.cn,58.250.157.161,127.0.0.1,localhost,192.168.110.35,192.168.110.41
+  servernames: 10.76.108.1,10.76.108.3,10.132.108.3,jdm.szssfj.cn,58.250.157.161,127.0.0.1,localhost,192.168.110.35,172.16.20.74
 
 excel:
   export: true

lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/application.yml

@@ -91,12 +91,12 @@ spring:
       # 启用cas单点登录环境
       #      - cas
       # 启用mysql版本
-      - druidDev
-      - dev
+#      - druidDev
+#      - dev
 #      - druidTest
 #      - test
-#      - druidPro
-#      - pro
+      - druidPro
+      - pro
 
       #分布式任务中心
       #      - job