国密依赖添加和appToken添加和模板方法添加和台账管理模块修改

business-service/src/main/java/com/ozs/service/entity/BaseAccountManagement.java

@@ -42,13 +42,7 @@ public class BaseAccountManagement extends BaseEntity implements Serializable {
      */
     @Excel(name = "相机编码")
     private Long cameraCode;
-
-    /**
-     * 剩余电量
-     */
-    @Excel(name = "剩余电量")
-    private Integer electricity;
-
+    
     /**
      * 通道编号
      */
@@ -101,9 +95,10 @@ public class BaseAccountManagement extends BaseEntity implements Serializable {
      */
     @Excel(name = "线路")
     private String line;
+
     /**
-     * 相机状态 1正常 2离线
+     * 线路
      */
-    @Excel(name = "相机状态")
-    private Integer cameraState;
+    @Excel(name = "物联网卡号")
+    private String cardNo;
 }

business-service/src/main/java/com/ozs/service/entity/BaseCameraRelation.java

@@ -1,10 +1,10 @@
 package com.ozs.service.entity;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
 import java.io.Serializable;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.ozs.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import lombok.AllArgsConstructor;
@@ -15,44 +15,39 @@ import lombok.NoArgsConstructor;
 
 /**
  * <p>
- * 台账管理关联表
+ * 台账管理表
  * </p>
  *
  * @author ozs
- * @since 2023-02-17
+ * @since 2023-02-22
  */
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
 @Builder
-@ApiModel("台账管理关联表")
-public class BaseCameraRelation extends BaseEntity implements Serializable {
+@ApiModel("台账管理表")
+public class BaseDynamicManagement extends BaseEntity implements Serializable{
 
     private static final long serialVersionUID = 1L;
 
     /**
      * 主键ID
      */
-    @TableId(type = IdType.AUTO)
-    private Long cameraRelationId;
-
-    /**
-     * 关联类型(0用户1角色2单位)
-     */
-    private Integer relationType;
+    @TableId(value = "account_management_id", type = IdType.AUTO)
+    private Long accountManagementId;
 
     /**
-     * 所属ID
+     * 相机编码
      */
-    private Long relationId;
+    private Long cameraCode;
 
     /**
-     * 台账管理ID
+     * 剩余电量
      */
-    private Long accountManagementId;
+    private Integer electricity;
 
     /**
-     * 报警信息ID
+     * 相机状态 1正常 2离线
      */
-    private Long alarmId;
+    private Integer cameraState;
 }

business-service/src/main/java/com/ozs/service/mapper/BaseCameraRelationMapper.java

@@ -1,16 +0,0 @@
-package com.ozs.service.mapper;
-
-import com.ozs.service.entity.BaseCameraRelation;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 台账管理关联表 Mapper 接口
- * </p>
- *
- * @author ozs
- * @since 2023-02-17
- */
-public interface BaseCameraRelationMapper extends BaseMapper<BaseCameraRelation> {
-
-}

business-service/src/main/java/com/ozs/service/mapper/BaseDynamicManagementMapper.java

@@ -0,0 +1,16 @@
+package com.ozs.service.mapper;
+
+import com.ozs.service.entity.BaseDynamicManagement;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 台账管理表 Mapper 接口
+ * </p>
+ *
+ * @author ozs
+ * @since 2023-02-22
+ */
+public interface BaseDynamicManagementMapper extends BaseMapper<BaseDynamicManagement> {
+
+}

business-service/src/main/java/com/ozs/service/service/BaseAccountManagementService.java

@@ -1,6 +1,5 @@
 package com.ozs.service.service;
 
-import com.ozs.common.core.domain.AjaxResult;
 import com.ozs.service.entity.BaseAccountManagement;
 import com.baomidou.mybatisplus.extension.service.IService;
 
@@ -15,22 +14,6 @@ import java.util.List;
  * @since 2023-02-17
  */
 public interface BaseAccountManagementService extends IService<BaseAccountManagement> {
-    /**
-     * 关联用户
-     * @param accountManagementId
-     * @param roleId
-     * @param userName
-     * @return
-     */
-    AjaxResult associatedUser(Long accountManagementId, Long roleId,String userName);
-
-    /**
-     * 关联用户回显
-     * @param accountManagementId
-     * @return
-     */
-    AjaxResult getRoleId(Long accountManagementId);
-
     /**
      * 台账管理导入
      * @param accountManageList

business-service/src/main/java/com/ozs/service/service/BaseDynamicManagementService.java

@@ -0,0 +1,16 @@
+package com.ozs.service.service;
+
+import com.ozs.service.entity.BaseDynamicManagement;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 台账管理表 服务类
+ * </p>
+ *
+ * @author ozs
+ * @since 2023-02-22
+ */
+public interface BaseDynamicManagementService extends IService<BaseDynamicManagement> {
+
+}

business-service/src/main/java/com/ozs/service/service/impl/BaseAccountManagementServiceImpl.java

@@ -1,19 +1,15 @@
 package com.ozs.service.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.ozs.common.core.domain.AjaxResult;
 import com.ozs.common.exception.ServiceException;
 import com.ozs.common.utils.bean.BeanValidators;
 import com.ozs.service.entity.BaseAccountManagement;
-import com.ozs.service.entity.BaseCameraRelation;
 import com.ozs.service.mapper.BaseAccountManagementMapper;
-import com.ozs.service.mapper.BaseCameraRelationMapper;
 import com.ozs.service.service.BaseAccountManagementService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.ObjectUtils;
-
 import javax.annotation.Resource;
 import javax.validation.Validator;
 import java.util.List;
@@ -28,55 +24,11 @@ import java.util.List;
  */
 @Service
 public class BaseAccountManagementServiceImpl extends ServiceImpl<BaseAccountManagementMapper, BaseAccountManagement> implements BaseAccountManagementService {
-    @Resource
-    BaseCameraRelationMapper baseCameraRelationMapper;
     @Autowired
     protected Validator validator;
     @Resource
     BaseAccountManagementMapper baseAccountManagementMapper;
 
-    @Override
-    public AjaxResult associatedUser(Long accountManagementId, Long roleId,String userName) {
-        BaseCameraRelation baseCameraRelation;
-        int insert = 0;
-        int update = 0;
-        LambdaQueryWrapper<BaseCameraRelation> lw = new LambdaQueryWrapper<BaseCameraRelation>();
-        if (!ObjectUtils.isEmpty(accountManagementId)) {
-            lw.eq(BaseCameraRelation::getAccountManagementId, accountManagementId);
-        }
-        baseCameraRelation = baseCameraRelationMapper.selectOne(lw);
-        if (!ObjectUtils.isEmpty(baseCameraRelation)) {
-            baseCameraRelation.setRelationId(roleId);
-            baseCameraRelation.setUpdateBy(userName);
-            update = baseCameraRelationMapper.updateById(baseCameraRelation);
-        } else {
-            baseCameraRelation = new BaseCameraRelation();
-            baseCameraRelation.setCreateBy(userName);
-            baseCameraRelation.setRelationId(roleId);
-            baseCameraRelation.setAccountManagementId(accountManagementId);
-            baseCameraRelation.setRelationType(1);
-            insert = baseCameraRelationMapper.insert(baseCameraRelation);
-        }
-        if (update > 0 || insert > 0) {
-            return AjaxResult.success();
-        }
-        return AjaxResult.error();
-    }
-
-    @Override
-    public AjaxResult getRoleId(Long accountManagementId) {
-        LambdaQueryWrapper<BaseCameraRelation> lw = new LambdaQueryWrapper<BaseCameraRelation>();
-        if (!ObjectUtils.isEmpty(accountManagementId)) {
-            lw.eq(BaseCameraRelation::getAccountManagementId, accountManagementId);
-        }
-        BaseCameraRelation baseCameraRelation = baseCameraRelationMapper.selectOne(lw);
-        if (!ObjectUtils.isEmpty(baseCameraRelation)) {
-            return AjaxResult.success(baseCameraRelation.getRelationId());
-        } else {
-            return AjaxResult.error();
-        }
-    }
-
     /**
      * 台账管理导入
      *

business-service/src/main/java/com/ozs/service/service/impl/BaseDynamicManagementServiceImpl.java

@@ -0,0 +1,20 @@
+package com.ozs.service.service.impl;
+
+import com.ozs.service.entity.BaseDynamicManagement;
+import com.ozs.service.mapper.BaseDynamicManagementMapper;
+import com.ozs.service.service.BaseDynamicManagementService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 台账管理表 服务实现类
+ * </p>
+ *
+ * @author ozs
+ * @since 2023-02-22
+ */
+@Service
+public class BaseDynamicManagementServiceImpl extends ServiceImpl<BaseDynamicManagementMapper, BaseDynamicManagement> implements BaseDynamicManagementService {
+
+}

business-service/src/main/resources/mapper.service/BaseCameraRelationMapper.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ozs.service.mapper.BaseCameraRelationMapper">
+<mapper namespace="com.ozs.service.mapper.BaseDynamicManagementMapper">
 
 </mapper>

business-service/src/test/java/com/ozs/service/test/CodeGet.java

@@ -48,7 +48,7 @@ public class CodeGet {
         // 5、策略配置
         StrategyConfig strategy = new StrategyConfig();
 
-        strategy.setInclude("base_line_management");
+        strategy.setInclude("base_dynamic_management");
 
         strategy.setNaming(NamingStrategy.underline_to_camel);//数据库表映射到实体的命名策略
 

hazard-admin/src/main/java/com/ozs/web/controller/accountmanagment/BaseAccountManagementController.java

@@ -6,13 +6,17 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ozs.common.core.controller.BaseController;
 import com.ozs.common.core.domain.AjaxResult;
-import com.ozs.common.core.domain.BaseEntity;
 import com.ozs.common.utils.StringUtils;
+import com.ozs.common.utils.file.FileUtils;
 import com.ozs.common.utils.poi.ExcelUtil;
 import com.ozs.service.entity.BaseAccountManagement;
+import com.ozs.service.entity.BaseDynamicManagement;
 import com.ozs.service.entity.vo.BaseAccountManagementVo;
 import com.ozs.service.service.BaseAccountManagementService;
+import com.ozs.service.service.BaseDynamicManagementService;
 import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.http.MediaType;
 import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -26,6 +30,7 @@ import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
+import java.io.InputStream;
 import java.util.List;
 
 /**
@@ -38,9 +43,12 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("/service/baseAccountManagement")
+@Slf4j
 public class BaseAccountManagementController extends BaseController {
     @Resource
     BaseAccountManagementService baseAccountManagementService;
+    @Resource
+    BaseDynamicManagementService baseDynamicManagementService;
 
     /**
      * 相机台账管理分页
@@ -96,7 +104,9 @@ public class BaseAccountManagementController extends BaseController {
     @ApiOperation("新增相机信息")
     public AjaxResult saveDistributionModule(@RequestBody BaseAccountManagement baseAccountManagement) {
         baseAccountManagement.setCreateBy(getUsername());
-        if (baseAccountManagementService.save(baseAccountManagement)) {
+        BaseDynamicManagement baseDynamicManagement = new BaseDynamicManagement();
+        baseDynamicManagement.setCameraCode(baseAccountManagement.getCameraCode());
+        if (baseAccountManagementService.save(baseAccountManagement) && baseDynamicManagementService.save(baseDynamicManagement)) {
             return AjaxResult.success();
         }
         return AjaxResult.error();
@@ -124,30 +134,6 @@ public class BaseAccountManagementController extends BaseController {
         return AjaxResult.success(baseAccountManagementService.getById(accountManagementId));
     }
 
-    /**
-     * 关联用户
-     *
-     * @param accountManagementId
-     * @param roleId
-     * @return
-     */
-    @GetMapping("/associatedUser/{accountManagementId}/{roleId}")
-    public AjaxResult associatedUser(@PathVariable Long accountManagementId, @PathVariable Long roleId) {
-        return baseAccountManagementService.associatedUser(accountManagementId, roleId,getUsername());
-    }
-
-    /**
-     * 关联用户回显
-     *
-     * @param accountManagementId
-     * @return
-     */
-    @GetMapping("/getRoleId/{accountManagementId}")
-    public AjaxResult getRoleId(@PathVariable Long accountManagementId) {
-        return baseAccountManagementService.getRoleId(accountManagementId);
-    }
-
-
     /**
      * 台账管理导入
      *
@@ -193,5 +179,19 @@ public class BaseAccountManagementController extends BaseController {
         ExcelUtil<BaseAccountManagement> util = new ExcelUtil<>(BaseAccountManagement.class);
         util.exportExcel(response, list, "台账管理相机数据");
     }
+
+
+    @ApiOperation("模板下载")
+    @GetMapping("/downloaExcel")
+    public void downloadZip(HttpServletResponse response) {
+        try {
+            InputStream resourceAsStream = this.getClass().getResourceAsStream("/template/planQuarter.xlsx");
+            response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE);
+            FileUtils.setAttachmentResponseHeader(response, "台账相机管理导入模板.xlsx");
+            FileUtils.writeBytesByInput(resourceAsStream, response.getOutputStream());
+        } catch (Exception e) {
+            log.error("下载文件失败", e);
+        }
+    }
 }
 

hazard-admin/src/main/java/com/ozs/web/controller/accountmanagment/BaseLineManagementController.java

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ozs.common.core.controller.BaseController;
 import com.ozs.common.core.domain.AjaxResult;
 import com.ozs.common.utils.StringUtils;
+import com.ozs.common.utils.file.FileUtils;
 import com.ozs.common.utils.poi.ExcelUtil;
 import com.ozs.service.entity.BaseAccountManagement;
 import com.ozs.service.entity.BaseLineManagement;
@@ -14,6 +15,8 @@ import com.ozs.service.entity.vo.BaseAccountManagementVo;
 import com.ozs.service.entity.vo.BaseLineManagementVo;
 import com.ozs.service.service.BaseLineManagementService;
 import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.http.MediaType;
 import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -27,6 +30,7 @@ import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
+import java.io.InputStream;
 import java.util.List;
 
 /**
@@ -39,6 +43,7 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("/service/baseLineManagement")
+@Slf4j
 public class BaseLineManagementController extends BaseController {
     @Resource
     BaseLineManagementService baseLineManagementService;
@@ -152,5 +157,18 @@ public class BaseLineManagementController extends BaseController {
         ExcelUtil<BaseLineManagement> util = new ExcelUtil<>(BaseLineManagement.class);
         util.exportExcel(response, list, "线路台账数据");
     }
+
+    @ApiOperation("模板下载")
+    @GetMapping("/downloaExcel")
+    public void downloadZip(HttpServletResponse response) {
+        try {
+            InputStream resourceAsStream = this.getClass().getResourceAsStream("/template/planQuarter.xlsx");
+            response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE);
+            FileUtils.setAttachmentResponseHeader(response, "台账线路管理导入模板.xlsx");
+            FileUtils.writeBytesByInput(resourceAsStream, response.getOutputStream());
+        } catch (Exception e) {
+            log.error("下载文件失败", e);
+        }
+    }
 }
 

hazard-sdk/src/main/java/com/ozs/controller/upload/GeoHazardMonitorTokenController.java

@@ -3,9 +3,12 @@ package com.ozs.controller.upload;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.ozs.common.core.domain.Result;
 import com.ozs.common.utils.ApiTokenUtils;
+import com.ozs.common.utils.AppTokenUtils;
 import com.ozs.common.utils.StringUtils;
 import com.ozs.service.entity.BaseAccountManagement;
+import com.ozs.service.entity.BaseDynamicManagement;
 import com.ozs.service.service.BaseAccountManagementService;
+import com.ozs.service.service.BaseDynamicManagementService;
 import com.ozs.vo.ReqDeviceVo;
 import com.ozs.vo.ReqMsgAlarmVo;
 import com.ozs.vo.RespGeoHazardMonitorVo;
@@ -34,10 +37,12 @@ public class GeoHazardMonitorTokenController {
     @Resource
     private ApiTokenUtils apiTokenUtils;
     @Resource
-    BaseAccountManagementService baseAccountManagementService;
+    private AppTokenUtils appTokenUtils;
+    @Resource
+    BaseDynamicManagementService baseDynamicManagementService;
 
     /**
-     * 获取访问令牌
+     * 获取web访问令牌
      *
      * @param grantType    授权类型，客户端模式（client_credentials）
      * @param clientId     客户端编号
@@ -45,7 +50,7 @@ public class GeoHazardMonitorTokenController {
      * @return
      */
     @PostMapping("/IPAddress/token")
-    public Result getToken(@RequestParam("grantType") String grantType,
+    public Result getWebToken(@RequestParam("grantType") String grantType,
                            @RequestParam("clientId") String clientId,
                            @RequestParam("clientSecret") String clientSecret) {
         // 生成令牌
@@ -61,6 +66,31 @@ public class GeoHazardMonitorTokenController {
         }
     }
 
+    /**
+     * 获取app访问令牌
+     *
+     * @param grantType    授权类型，客户端模式（client_credentials）
+     * @param clientId     客户端编号
+     * @param clientSecret 客户端密钥
+     * @return
+     */
+    @PostMapping("/App/token")
+    public Result getAppToken(@RequestParam("grantType") String grantType,
+                           @RequestParam("clientId") String clientId,
+                           @RequestParam("clientSecret") String clientSecret) {
+        // 生成令牌
+        ArrayList<String> objects = appTokenUtils.createGeoHazardMonitorToken();
+        if (objects.size() > 0) {
+            RespGeoHazardMonitorVo respGeoHazardMonitorVo = new RespGeoHazardMonitorVo();
+            respGeoHazardMonitorVo.setAccessToken(objects.get(1));
+            respGeoHazardMonitorVo.setExpiresIn(Long.valueOf(objects.get(0)));
+            respGeoHazardMonitorVo.setTokenType("令牌类型");
+            return new Result(1, "成功", respGeoHazardMonitorVo);
+        } else {
+            return new Result(2, "失败", "生成token失败！！");
+        }
+    }
+
     /**
      * 报警信息数据传输
      *
@@ -77,7 +107,6 @@ public class GeoHazardMonitorTokenController {
             respMsgAlarmVo.setAlarmId(reqMsgAlarmVo.getAlarmId());
             respMsgAlarmVo.setAlarmCamera(reqMsgAlarmVo.getAlarmCamera());
             respMsgAlarmVo.setCancelTime("");
-            respMsgAlarmVo.setIsCancel(reqMsgAlarmVo.getIsLock());
             return new Result(1, "成功", respMsgAlarmVo);
         } else {
             return new Result(2, "失败", "生成token失败！！");
@@ -93,15 +122,14 @@ public class GeoHazardMonitorTokenController {
      */
     @PostMapping("/IPAddress /device/state")
     public Result deviceState(@RequestBody ReqDeviceVo reqDeviceVo) throws ParseException {
-        LambdaQueryWrapper<BaseAccountManagement> lw = new LambdaQueryWrapper<BaseAccountManagement>();
+        LambdaQueryWrapper<BaseDynamicManagement> lw = new LambdaQueryWrapper<BaseDynamicManagement>();
         if (!ObjectUtils.isEmpty(reqDeviceVo.getCameraCode())) {
-            lw.eq(BaseAccountManagement::getCameraCode, reqDeviceVo.getCameraCode());
+            lw.eq(BaseDynamicManagement::getCameraCode, reqDeviceVo.getCameraCode());
         }
-        BaseAccountManagement baseAccountManagement = baseAccountManagementService.getOne(lw);
-        baseAccountManagement.setElectricity(Integer.valueOf(reqDeviceVo.getElectricity()));
-        baseAccountManagement.setCameraState(Integer.valueOf(reqDeviceVo.getCameraState()));
-        baseAccountManagement.setUpdateTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(reqDeviceVo.getTime()));
-        if (baseAccountManagementService.updateById(baseAccountManagement)) {
+        BaseDynamicManagement baseDynamicManagement = baseDynamicManagementService.getOne(lw);
+        baseDynamicManagement.setElectricity(Integer.valueOf(reqDeviceVo.getElectricity()));
+        baseDynamicManagement.setUpdateTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(reqDeviceVo.getTime()));
+        if (baseDynamicManagementService.updateById(baseDynamicManagement)) {
             return new Result(1, "成功");
         }
         return new Result(2, "失败");

hazard-sdk/src/main/java/com/ozs/vo/ReqDeviceVo.java

@@ -23,8 +23,4 @@ public class ReqDeviceVo implements Serializable {
      * 剩余电量
      */
     private String electricity;
-    /**
-     * 相机状态 1正常 2离线
-     */
-    private String cameraState;
 }

hazard-sdk/src/main/java/com/ozs/vo/ReqMsgAlarmVo.java

@@ -42,12 +42,7 @@ public class ReqMsgAlarmVo implements Serializable {
 
     /** 报警病害属性（可以给出泥石流的框定范围） */
     private String alarmArrr;
-
-    private String files;
-
+    
     /** 报警图片地址 */
     private String imageUrl;
-
-    /** 报警是否解除 1已解除2未解除 */
-    private Integer isLock;
 }

hazard-sdk/src/main/resources/application.yml

@@ -90,7 +90,7 @@ spring:
         # #连接池最大阻塞等待时间（使用负值表示没有限制）
         max-wait: -1ms
 
-# token配置
+# web:token配置
 token:
     # 令牌自定义标识
     header: Authorization
@@ -98,6 +98,15 @@ token:
     secret: abcdefghijklmnopqrstuvwxyz
     # 令牌有效期（默认30分钟）
     expireTime: 30
+    
+# app:token配置
+apptoken:
+  # 令牌自定义标识
+  header: Authorization
+  # 令牌密钥
+  secret: qwertyuiopasdfghjklzxcvbnm
+  # 令牌有效期（默认15天）
+  expireTime: 21600    
 
 # MyBatis配置
 mybatis:

hazard-stateSecrets/pom.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>GeoHazardMonitor</artifactId>
+        <groupId>com.ozs</groupId>
+        <version>1.0</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>hazard-stateSecrets</artifactId>
+
+    <dependencies>
+        
+        <dependency>
+            <groupId>com.ozs</groupId>
+            <artifactId>business-service</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.springframework.boot</groupId>
+                    <artifactId>spring-boot-starter-security</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+    </dependencies>
+</project>

hazard-stateSecrets/src/main/java/com/ozs/stateSecrets/utils/SM2Result.java

@@ -0,0 +1,25 @@
+package com.ozs.stateSecrets.utils;
+
+import org.bouncycastle.math.ec.ECPoint;
+
+import java.math.BigInteger;
+
+public class SM2Result
+{
+	public SM2Result() {
+	}
+
+	// 签名/验签
+	public BigInteger r;
+	public BigInteger s;
+	public BigInteger R;
+
+	// 密钥交换
+	public byte[] sa;
+	public byte[] sb;
+	public byte[] s1;
+	public byte[] s2;
+
+	public ECPoint keyra;
+	public ECPoint keyrb;
+}

hazard-stateSecrets/src/main/java/com/ozs/stateSecrets/utils/SM3.java

@@ -0,0 +1,359 @@
+package com.ozs.stateSecrets.utils;
+
+
+public class SM3
+{
+	/*public static final byte[] iv = { 0x2C, (byte) 0x91, (byte) 0xB4, 0x01,
+			(byte) 0xFC, 0x64, (byte) 0xB2, (byte) 0xCE, 0x7C, 0x4E,
+			(byte) 0xAE, (byte) 0xFB, (byte) 0xB1, 0x3B, (byte) 0xB6,
+			(byte) 0xD3, 0x17, 0x60, (byte) 0xB6, 0x35, (byte) 0xF3, 0x6F,
+			0x13, (byte) 0xEB, (byte) 0xC8, 0x77, (byte) 0xE9, (byte) 0xA0,
+			(byte) 0xC2, 0x76, (byte) 0xA8, 0x17 };*/
+
+	public static final byte[] iv = { 0x73, (byte) 0x80, 0x16, 0x6f, 0x49,
+		0x14, (byte) 0xb2, (byte) 0xb9, 0x17, 0x24, 0x42, (byte) 0xd7,
+		(byte) 0xda, (byte) 0x8a, 0x06, 0x00, (byte) 0xa9, 0x6f, 0x30,
+		(byte) 0xbc, (byte) 0x16, 0x31, 0x38, (byte) 0xaa, (byte) 0xe3,
+		(byte) 0x8d, (byte) 0xee, 0x4d, (byte) 0xb0, (byte) 0xfb, 0x0e,
+		0x4e };
+
+	public static int[] Tj = new int[64];
+
+	static
+	{
+		for (int i = 0; i < 16; i++)
+		{
+			Tj[i] = 0x79cc4519;
+		}
+
+		for (int i = 16; i < 64; i++)
+		{
+			Tj[i] = 0x7a879d8a;
+		}
+	}
+
+	public static byte[] CF(byte[] V, byte[] B)
+	{
+		int[] v, b;
+		v = convert(V);
+		b = convert(B);
+		return convert(CF(v, b));
+	}
+
+	private static int[] convert(byte[] arr)
+	{
+		int[] out = new int[arr.length / 4];
+		byte[] tmp = new byte[4];
+		for (int i = 0; i < arr.length; i += 4)
+		{
+			System.arraycopy(arr, i, tmp, 0, 4);
+			out[i / 4] = bigEndianByteToInt(tmp);
+		}
+		return out;
+	}
+
+	private static byte[] convert(int[] arr)
+	{
+		byte[] out = new byte[arr.length * 4];
+		byte[] tmp = null;
+		for (int i = 0; i < arr.length; i++)
+		{
+			tmp = bigEndianIntToByte(arr[i]);
+			System.arraycopy(tmp, 0, out, i * 4, 4);
+		}
+		return out;
+	}
+
+	public static int[] CF(int[] V, int[] B)
+	{
+		int a, b, c, d, e, f, g, h;
+		int ss1, ss2, tt1, tt2;
+		a = V[0];
+		b = V[1];
+		c = V[2];
+		d = V[3];
+		e = V[4];
+		f = V[5];
+		g = V[6];
+		h = V[7];
+
+		/*System.out.println("IV: ");
+		System.out.print(Integer.toHexString(a)+" ");
+		System.out.print(Integer.toHexString(b)+" ");
+		System.out.print(Integer.toHexString(c)+" ");
+		System.out.print(Integer.toHexString(d)+" ");
+		System.out.print(Integer.toHexString(e)+" ");
+		System.out.print(Integer.toHexString(f)+" ");
+		System.out.print(Integer.toHexString(g)+" ");
+		System.out.print(Integer.toHexString(h)+" ");
+		System.out.println("");
+		System.out.println("");
+
+		System.out.println("�������Ϣ: ");
+		for(int i=0; i<B.length; i++)
+		{
+			System.out.print(Integer.toHexString(B[i])+" ");
+		}
+		System.out.println("");
+		System.out.println("");*/
+
+		int[][] arr = expand(B);
+		int[] w = arr[0];
+		int[] w1 = arr[1];
+
+		/*System.out.println("��չ�����Ϣ�� ");
+		System.out.println("W0W1...W67");
+		print(w);
+		System.out.println("");
+		System.out.println("W'0W'1...W'67");
+		print(w1);
+		System.out.println("����ѹ���м�ֵ: ");*/
+
+		for (int j = 0; j < 64; j++)
+		{
+			ss1 = (bitCycleLeft(a, 12) + e + bitCycleLeft(Tj[j], j));
+			ss1 = bitCycleLeft(ss1, 7);
+			ss2 = ss1 ^ bitCycleLeft(a, 12);
+			tt1 = FFj(a, b, c, j) + d + ss2 + w1[j];
+			tt2 = GGj(e, f, g, j) + h + ss1 + w[j];
+			d = c;
+			c = bitCycleLeft(b, 9);
+			b = a;
+			a = tt1;
+			h = g;
+			g = bitCycleLeft(f, 19);
+			f = e;
+			e = P0(tt2);
+
+			/*System.out.print(j+" ");
+			System.out.print(Integer.toHexString(a)+" ");
+			System.out.print(Integer.toHexString(b)+" ");
+			System.out.print(Integer.toHexString(c)+" ");
+			System.out.print(Integer.toHexString(d)+" ");
+			System.out.print(Integer.toHexString(e)+" ");
+			System.out.print(Integer.toHexString(f)+" ");
+			System.out.print(Integer.toHexString(g)+" ");
+			System.out.print(Integer.toHexString(h)+" ");
+			System.out.println("");*/
+		}
+//		System.out.println("");
+
+		int[] out = new int[8];
+		out[0] = a ^ V[0];
+		out[1] = b ^ V[1];
+		out[2] = c ^ V[2];
+		out[3] = d ^ V[3];
+		out[4] = e ^ V[4];
+		out[5] = f ^ V[5];
+		out[6] = g ^ V[6];
+		out[7] = h ^ V[7];
+
+		return out;
+	}
+
+	private static int[][] expand(int[] B)
+	{
+		int W[] = new int[68];
+		int W1[] = new int[64];
+		for (int i = 0; i < B.length; i++)
+		{
+			W[i] = B[i];
+		}
+
+		for (int i = 16; i < 68; i++)
+		{
+			W[i] = P1(W[i - 16] ^ W[i - 9] ^ bitCycleLeft(W[i - 3], 15))
+					^ bitCycleLeft(W[i - 13], 7) ^ W[i - 6];
+		}
+
+		for (int i = 0; i < 64; i++)
+		{
+			W1[i] = W[i] ^ W[i + 4];
+		}
+
+		int arr[][] = new int[][] { W, W1 };
+		return arr;
+	}
+
+	private static byte[] bigEndianIntToByte(int num)
+	{
+		return back(Util.intToBytes(num));
+	}
+
+	private static int bigEndianByteToInt(byte[] bytes)
+	{
+		return Util.byteToInt(back(bytes));
+	}
+
+	private static int FFj(int X, int Y, int Z, int j)
+	{
+		if (j >= 0 && j <= 15)
+		{
+			return FF1j(X, Y, Z);
+		}
+		else
+		{
+			return FF2j(X, Y, Z);
+		}
+	}
+
+	private static int GGj(int X, int Y, int Z, int j)
+	{
+		if (j >= 0 && j <= 15)
+		{
+			return GG1j(X, Y, Z);
+		}
+		else
+		{
+			return GG2j(X, Y, Z);
+		}
+	}
+
+	// �߼�λ���㺯��
+	private static int FF1j(int X, int Y, int Z)
+	{
+		int tmp = X ^ Y ^ Z;
+		return tmp;
+	}
+
+	private static int FF2j(int X, int Y, int Z)
+	{
+		int tmp = ((X & Y) | (X & Z) | (Y & Z));
+		return tmp;
+	}
+
+	private static int GG1j(int X, int Y, int Z)
+	{
+		int tmp = X ^ Y ^ Z;
+		return tmp;
+	}
+
+	private static int GG2j(int X, int Y, int Z)
+	{
+		int tmp = (X & Y) | (~X & Z);
+		return tmp;
+	}
+
+	private static int P0(int X)
+	{
+		int y = rotateLeft(X, 9);
+		y = bitCycleLeft(X, 9);
+		int z = rotateLeft(X, 17);
+		z = bitCycleLeft(X, 17);
+		int t = X ^ y ^ z;
+		return t;
+	}
+
+	private static int P1(int X)
+	{
+		int t = X ^ bitCycleLeft(X, 15) ^ bitCycleLeft(X, 23);
+		return t;
+	}
+
+	/**
+	 * �����һ�������ֽ�����padding
+	 *
+	 * @param in
+	 * @param bLen
+	 *            �������
+	 * @return
+	 */
+	public static byte[] padding(byte[] in, int bLen)
+	{
+		int k = 448 - (8 * in.length + 1) % 512;
+		if (k < 0)
+		{
+			k = 960 - (8 * in.length + 1) % 512;
+		}
+		k += 1;
+		byte[] padd = new byte[k / 8];
+		padd[0] = (byte) 0x80;
+		long n = in.length * 8 + bLen * 512;
+		byte[] out = new byte[in.length + k / 8 + 64 / 8];
+		int pos = 0;
+		System.arraycopy(in, 0, out, 0, in.length);
+		pos += in.length;
+		System.arraycopy(padd, 0, out, pos, padd.length);
+		pos += padd.length;
+		byte[] tmp = back(Util.longToBytes(n));
+		System.arraycopy(tmp, 0, out, pos, tmp.length);
+		return out;
+	}
+
+	/**
+	 * �ֽ���������
+	 *
+	 * @param in
+	 * @return
+	 */
+	private static byte[] back(byte[] in)
+	{
+		byte[] out = new byte[in.length];
+		for (int i = 0; i < out.length; i++)
+		{
+			out[i] = in[out.length - i - 1];
+		}
+
+		return out;
+	}
+
+	public static int rotateLeft(int x, int n)
+	{
+		return (x << n) | (x >> (32 - n));
+	}
+
+	private static int bitCycleLeft(int n, int bitLen)
+	{
+		bitLen %= 32;
+		byte[] tmp = bigEndianIntToByte(n);
+		int byteLen = bitLen / 8;
+		int len = bitLen % 8;
+		if (byteLen > 0)
+		{
+			tmp = byteCycleLeft(tmp, byteLen);
+		}
+
+		if (len > 0)
+		{
+			tmp = bitSmall8CycleLeft(tmp, len);
+		}
+
+		return bigEndianByteToInt(tmp);
+	}
+
+	private static byte[] bitSmall8CycleLeft(byte[] in, int len)
+	{
+		byte[] tmp = new byte[in.length];
+		int t1, t2, t3;
+		for (int i = 0; i < tmp.length; i++)
+		{
+			t1 = (byte) ((in[i] & 0x000000ff) << len);
+			t2 = (byte) ((in[(i + 1) % tmp.length] & 0x000000ff) >> (8 - len));
+			t3 = (byte) (t1 | t2);
+			tmp[i] = (byte) t3;
+		}
+
+		return tmp;
+	}
+
+	private static byte[] byteCycleLeft(byte[] in, int byteLen)
+	{
+		byte[] tmp = new byte[in.length];
+		System.arraycopy(in, byteLen, tmp, 0, in.length - byteLen);
+		System.arraycopy(in, 0, tmp, in.length - byteLen, byteLen);
+		return tmp;
+	}
+
+	/*private static void print(int[] arr)
+	{
+		for (int i = 0; i < arr.length; i++)
+		{
+			System.out.print(Integer.toHexString(arr[i]) + " ");
+			if ((i + 1) % 16 == 0)
+			{
+				System.out.println();
+			}
+		}
+		System.out.println();
+	}*/
+}

hazard-stateSecrets/src/main/java/com/ozs/stateSecrets/utils/SM3Digest.java

@@ -0,0 +1,123 @@
+package com.ozs.stateSecrets.utils;
+
+
+import org.bouncycastle.util.encoders.Hex;
+
+import java.nio.charset.StandardCharsets;
+
+public class SM3Digest
+{
+  private static final int BYTE_LENGTH = 32;
+  private static final int BLOCK_LENGTH = 64;
+  private static final int BUFFER_LENGTH = 64;
+  private byte[] xBuf = new byte[64];
+  private int xBufOff;
+  private byte[] V = (byte[])SM3.iv.clone();
+
+  private int cntBlock = 0;
+
+  public SM3Digest()
+  {
+  }
+
+  public SM3Digest(SM3Digest t) {
+    System.arraycopy(t.xBuf, 0, this.xBuf, 0, t.xBuf.length);
+    this.xBufOff = t.xBufOff;
+    System.arraycopy(t.V, 0, this.V, 0, t.V.length);
+  }
+
+  public int doFinal(byte[] out, int outOff)
+  {
+    byte[] tmp = doFinal();
+    System.arraycopy(tmp, 0, out, 0, tmp.length);
+    return 32;
+  }
+
+  public void reset()
+  {
+    this.xBufOff = 0;
+    this.cntBlock = 0;
+    this.V = ((byte[])SM3.iv.clone());
+  }
+
+  public void update(byte[] in, int inOff, int len)
+  {
+    int partLen = 64 - this.xBufOff;
+    int inputLen = len;
+    int dPos = inOff;
+    if (partLen < inputLen)
+    {
+      System.arraycopy(in, dPos, this.xBuf, this.xBufOff, partLen);
+      inputLen -= partLen;
+      dPos += partLen;
+      doUpdate();
+      while (inputLen > 64)
+      {
+        System.arraycopy(in, dPos, this.xBuf, 0, 64);
+        inputLen -= 64;
+        dPos += 64;
+        doUpdate();
+      }
+    }
+
+    System.arraycopy(in, dPos, this.xBuf, this.xBufOff, inputLen);
+    this.xBufOff += inputLen;
+  }
+
+  private void doUpdate()
+  {
+    byte[] B = new byte[64];
+    for (int i = 0; i < 64; i += 64)
+    {
+      System.arraycopy(this.xBuf, i, B, 0, B.length);
+      doHash(B);
+    }
+    this.xBufOff = 0;
+  }
+
+  private void doHash(byte[] B)
+  {
+    byte[] tmp = SM3.CF(this.V, B);
+    System.arraycopy(tmp, 0, this.V, 0, this.V.length);
+    this.cntBlock += 1;
+  }
+
+  private byte[] doFinal()
+  {
+    byte[] B = new byte[64];
+    byte[] buffer = new byte[this.xBufOff];
+    System.arraycopy(this.xBuf, 0, buffer, 0, buffer.length);
+    byte[] tmp = SM3.padding(buffer, this.cntBlock);
+    for (int i = 0; i < tmp.length; i += 64)
+    {
+      System.arraycopy(tmp, i, B, 0, B.length);
+      doHash(B);
+    }
+    return this.V;
+  }
+
+  public void update(byte in)
+  {
+    byte[] buffer = { in };
+    update(buffer, 0, 1);
+  }
+
+  public int getDigestSize()
+  {
+    return 32;
+  }
+
+  public static String SM3Encrypt(String str){
+    byte[] md = new byte[32];
+    byte[] msg1 = str.getBytes(StandardCharsets.UTF_8);
+    SM3Digest sm3 = new SM3Digest();
+    sm3.update(msg1, 0, msg1.length);
+    sm3.doFinal(md, 0);
+    return new String(Hex.encode(md), StandardCharsets.UTF_8);
+  }
+
+  public static void main(String[] args) {
+    String s = SM3Encrypt("中文123");
+    System.out.println(s);
+  }
+}

hazard-stateSecrets/src/main/java/com/ozs/stateSecrets/utils/SM4.java

@@ -0,0 +1,344 @@
+package com.ozs.stateSecrets.utils;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+
+public class SM4
+{
+	public static final int SM4_ENCRYPT = 1;
+
+	public static final int SM4_DECRYPT = 0;
+
+	private long GET_ULONG_BE(byte[] b, int i)
+	{
+		long n = (long)(b[i] & 0xff) << 24 | (long)((b[i + 1] & 0xff) << 16) | (long)((b[i + 2] & 0xff) << 8) | (long)(b[i + 3] & 0xff) & 0xffffffffL;
+		return n;
+	}
+
+	private void PUT_ULONG_BE(long n, byte[] b, int i)
+	{
+		b[i] = (byte)(int)(0xFF & n >> 24);
+        b[i + 1] = (byte)(int)(0xFF & n >> 16);
+        b[i + 2] = (byte)(int)(0xFF & n >> 8);
+        b[i + 3] = (byte)(int)(0xFF & n);
+	}
+
+	private long SHL(long x, int n)
+	{
+		return (x & 0xFFFFFFFF) << n;
+	}
+
+	private long ROTL(long x, int n)
+	{
+		return SHL(x, n) | x >> (32 - n);
+	}
+
+	private void SWAP(long[] sk, int i)
+	{
+		long t = sk[i];
+		sk[i] = sk[(31 - i)];
+		sk[(31 - i)] = t;
+	}
+
+	public static final byte[] SboxTable = { (byte) 0xd6, (byte) 0x90, (byte) 0xe9, (byte) 0xfe,
+		(byte) 0xcc, (byte) 0xe1, 0x3d, (byte) 0xb7, 0x16, (byte) 0xb6,
+		0x14, (byte) 0xc2, 0x28, (byte) 0xfb, 0x2c, 0x05, 0x2b, 0x67,
+		(byte) 0x9a, 0x76, 0x2a, (byte) 0xbe, 0x04, (byte) 0xc3,
+		(byte) 0xaa, 0x44, 0x13, 0x26, 0x49, (byte) 0x86, 0x06,
+		(byte) 0x99, (byte) 0x9c, 0x42, 0x50, (byte) 0xf4, (byte) 0x91,
+		(byte) 0xef, (byte) 0x98, 0x7a, 0x33, 0x54, 0x0b, 0x43,
+		(byte) 0xed, (byte) 0xcf, (byte) 0xac, 0x62, (byte) 0xe4,
+		(byte) 0xb3, 0x1c, (byte) 0xa9, (byte) 0xc9, 0x08, (byte) 0xe8,
+		(byte) 0x95, (byte) 0x80, (byte) 0xdf, (byte) 0x94, (byte) 0xfa,
+		0x75, (byte) 0x8f, 0x3f, (byte) 0xa6, 0x47, 0x07, (byte) 0xa7,
+		(byte) 0xfc, (byte) 0xf3, 0x73, 0x17, (byte) 0xba, (byte) 0x83,
+		0x59, 0x3c, 0x19, (byte) 0xe6, (byte) 0x85, 0x4f, (byte) 0xa8,
+		0x68, 0x6b, (byte) 0x81, (byte) 0xb2, 0x71, 0x64, (byte) 0xda,
+		(byte) 0x8b, (byte) 0xf8, (byte) 0xeb, 0x0f, 0x4b, 0x70, 0x56,
+		(byte) 0x9d, 0x35, 0x1e, 0x24, 0x0e, 0x5e, 0x63, 0x58, (byte) 0xd1,
+		(byte) 0xa2, 0x25, 0x22, 0x7c, 0x3b, 0x01, 0x21, 0x78, (byte) 0x87,
+		(byte) 0xd4, 0x00, 0x46, 0x57, (byte) 0x9f, (byte) 0xd3, 0x27,
+		0x52, 0x4c, 0x36, 0x02, (byte) 0xe7, (byte) 0xa0, (byte) 0xc4,
+		(byte) 0xc8, (byte) 0x9e, (byte) 0xea, (byte) 0xbf, (byte) 0x8a,
+		(byte) 0xd2, 0x40, (byte) 0xc7, 0x38, (byte) 0xb5, (byte) 0xa3,
+		(byte) 0xf7, (byte) 0xf2, (byte) 0xce, (byte) 0xf9, 0x61, 0x15,
+		(byte) 0xa1, (byte) 0xe0, (byte) 0xae, 0x5d, (byte) 0xa4,
+		(byte) 0x9b, 0x34, 0x1a, 0x55, (byte) 0xad, (byte) 0x93, 0x32,
+		0x30, (byte) 0xf5, (byte) 0x8c, (byte) 0xb1, (byte) 0xe3, 0x1d,
+		(byte) 0xf6, (byte) 0xe2, 0x2e, (byte) 0x82, 0x66, (byte) 0xca,
+		0x60, (byte) 0xc0, 0x29, 0x23, (byte) 0xab, 0x0d, 0x53, 0x4e, 0x6f,
+		(byte) 0xd5, (byte) 0xdb, 0x37, 0x45, (byte) 0xde, (byte) 0xfd,
+		(byte) 0x8e, 0x2f, 0x03, (byte) 0xff, 0x6a, 0x72, 0x6d, 0x6c, 0x5b,
+		0x51, (byte) 0x8d, 0x1b, (byte) 0xaf, (byte) 0x92, (byte) 0xbb,
+		(byte) 0xdd, (byte) 0xbc, 0x7f, 0x11, (byte) 0xd9, 0x5c, 0x41,
+		0x1f, 0x10, 0x5a, (byte) 0xd8, 0x0a, (byte) 0xc1, 0x31,
+		(byte) 0x88, (byte) 0xa5, (byte) 0xcd, 0x7b, (byte) 0xbd, 0x2d,
+		0x74, (byte) 0xd0, 0x12, (byte) 0xb8, (byte) 0xe5, (byte) 0xb4,
+		(byte) 0xb0, (byte) 0x89, 0x69, (byte) 0x97, 0x4a, 0x0c,
+		(byte) 0x96, 0x77, 0x7e, 0x65, (byte) 0xb9, (byte) 0xf1, 0x09,
+		(byte) 0xc5, 0x6e, (byte) 0xc6, (byte) 0x84, 0x18, (byte) 0xf0,
+		0x7d, (byte) 0xec, 0x3a, (byte) 0xdc, 0x4d, 0x20, 0x79,
+		(byte) 0xee, 0x5f, 0x3e, (byte) 0xd7, (byte) 0xcb, 0x39, 0x48 };
+
+	public static final int[] FK = { 0xa3b1bac6, 0x56aa3350, 0x677d9197, 0xb27022dc };
+
+	public static final int[] CK = { 0x00070e15,0x1c232a31,0x383f464d,0x545b6269,
+		0x70777e85,0x8c939aa1,0xa8afb6bd,0xc4cbd2d9,
+		0xe0e7eef5,0xfc030a11,0x181f262d,0x343b4249,
+		0x50575e65,0x6c737a81,0x888f969d,0xa4abb2b9,
+		0xc0c7ced5,0xdce3eaf1,0xf8ff060d,0x141b2229,
+		0x30373e45,0x4c535a61,0x686f767d,0x848b9299,
+		0xa0a7aeb5,0xbcc3cad1,0xd8dfe6ed,0xf4fb0209,
+		0x10171e25,0x2c333a41,0x484f565d,0x646b7279 };
+
+	private byte sm4Sbox(byte inch)
+	{
+		int i = inch & 0xFF;
+		byte retVal = SboxTable[i];
+		return retVal;
+	}
+
+	private long sm4Lt(long ka)
+	{
+		long bb = 0L;
+		long c = 0L;
+		byte[] a = new byte[4];
+		byte[] b = new byte[4];
+		PUT_ULONG_BE(ka, a, 0);
+		b[0] = sm4Sbox(a[0]);
+		b[1] = sm4Sbox(a[1]);
+		b[2] = sm4Sbox(a[2]);
+		b[3] = sm4Sbox(a[3]);
+		bb = GET_ULONG_BE(b, 0);
+		c = bb ^ ROTL(bb, 2) ^ ROTL(bb, 10) ^ ROTL(bb, 18) ^ ROTL(bb, 24);
+		return c;
+	}
+
+	private long sm4F(long x0, long x1, long x2, long x3, long rk)
+	{
+		return x0 ^ sm4Lt(x1 ^ x2 ^ x3 ^ rk);
+	}
+
+	private long sm4CalciRK(long ka)
+	{
+		long bb = 0L;
+		long rk = 0L;
+		byte[] a = new byte[4];
+		byte[] b = new byte[4];
+		PUT_ULONG_BE(ka, a, 0);
+		b[0] = sm4Sbox(a[0]);
+		b[1] = sm4Sbox(a[1]);
+		b[2] = sm4Sbox(a[2]);
+		b[3] = sm4Sbox(a[3]);
+		bb = GET_ULONG_BE(b, 0);
+		rk = bb ^ ROTL(bb, 13) ^ ROTL(bb, 23);
+		return rk;
+	}
+
+	private void sm4_setkey(long[] SK, byte[] key)
+	{
+		long[] MK = new long[4];
+		long[] k = new long[36];
+		int i = 0;
+		MK[0] = GET_ULONG_BE(key, 0);
+		MK[1] = GET_ULONG_BE(key, 4);
+		MK[2] = GET_ULONG_BE(key, 8);
+		MK[3] = GET_ULONG_BE(key, 12);
+		k[0] = MK[0] ^ (long) FK[0];
+		k[1] = MK[1] ^ (long) FK[1];
+		k[2] = MK[2] ^ (long) FK[2];
+		k[3] = MK[3] ^ (long) FK[3];
+		for (; i < 32; i++)
+		{
+			k[(i + 4)] = (k[i] ^ sm4CalciRK(k[(i + 1)] ^ k[(i + 2)] ^ k[(i + 3)] ^ (long) CK[i]));
+			SK[i] = k[(i + 4)];
+		}
+	}
+
+	private void sm4_one_round(long[] sk, byte[] input, byte[] output)
+	{
+		int i = 0;
+		long[] ulbuf = new long[36];
+		ulbuf[0] = GET_ULONG_BE(input, 0);
+		ulbuf[1] = GET_ULONG_BE(input, 4);
+		ulbuf[2] = GET_ULONG_BE(input, 8);
+		ulbuf[3] = GET_ULONG_BE(input, 12);
+		while (i < 32)
+		{
+			ulbuf[(i + 4)] = sm4F(ulbuf[i], ulbuf[(i + 1)], ulbuf[(i + 2)], ulbuf[(i + 3)], sk[i]);
+			i++;
+		}
+		PUT_ULONG_BE(ulbuf[35], output, 0);
+		PUT_ULONG_BE(ulbuf[34], output, 4);
+		PUT_ULONG_BE(ulbuf[33], output, 8);
+		PUT_ULONG_BE(ulbuf[32], output, 12);
+	}
+
+	private byte[] padding(byte[] input, int mode)
+	{
+		if (input == null)
+		{
+			return null;
+		}
+
+		byte[] ret = (byte[]) null;
+		if (mode == SM4_ENCRYPT)
+		{
+			int p = 16 - input.length % 16;
+			ret = new byte[input.length + p];
+			System.arraycopy(input, 0, ret, 0, input.length);
+			for (int i = 0; i < p; i++)
+			{
+				ret[input.length + i] = (byte) p;
+			}
+		}
+		else
+		{
+			int p = input[input.length - 1];
+			ret = new byte[input.length - p];
+			System.arraycopy(input, 0, ret, 0, input.length - p);
+		}
+		return ret;
+	}
+
+	public void sm4_setkey_enc(SM4Context ctx, byte[] key) throws Exception
+	{
+		if (ctx == null)
+		{
+			throw new Exception("ctx is null!");
+		}
+
+		if (key == null || key.length != 16)
+		{
+			throw new Exception("key error!");
+		}
+
+		ctx.mode = SM4_ENCRYPT;
+		sm4_setkey(ctx.sk, key);
+	}
+
+	public void sm4_setkey_dec(SM4Context ctx, byte[] key) throws Exception
+	{
+		if (ctx == null)
+		{
+			throw new Exception("ctx is null!");
+		}
+
+		if (key == null || key.length != 16)
+		{
+			throw new Exception("key error!");
+		}
+
+		int i = 0;
+		ctx.mode = SM4_DECRYPT;
+		sm4_setkey(ctx.sk, key);
+		for (i = 0; i < 16; i++)
+		{
+			SWAP(ctx.sk, i);
+		}
+	}
+
+	public byte[] sm4_crypt_ecb(SM4Context ctx, byte[] input) throws Exception
+	{
+		if (input == null)
+		{
+			throw new Exception("input is null!");
+		}
+
+		if ((ctx.isPadding) && (ctx.mode == SM4_ENCRYPT))
+		{
+			input = padding(input, SM4_ENCRYPT);
+		}
+
+		int length = input.length;
+		ByteArrayInputStream bins = new ByteArrayInputStream(input);
+		ByteArrayOutputStream bous = new ByteArrayOutputStream();
+		for(; length > 0; length -= 16)
+		{
+			byte[] in = new byte[16];
+			byte[] out = new byte[16];
+			bins.read(in);
+			sm4_one_round(ctx.sk, in, out);
+			bous.write(out);
+		}
+
+		byte[] output = bous.toByteArray();
+		if (ctx.isPadding && ctx.mode == SM4_DECRYPT)
+		{
+			output = padding(output, SM4_DECRYPT);
+		}
+		bins.close();
+		bous.close();
+		return output;
+	}
+
+	public byte[] sm4_crypt_cbc(SM4Context ctx, byte[] iv, byte[] input) throws Exception
+	{
+		if (iv == null || iv.length != 16)
+		{
+			throw new Exception("iv error!");
+		}
+
+		if (input == null)
+		{
+			throw new Exception("input is null!");
+		}
+
+		if (ctx.isPadding && ctx.mode == SM4_ENCRYPT)
+		{
+			input = padding(input, SM4_ENCRYPT);
+		}
+
+		int i = 0;
+		int length = input.length;
+		ByteArrayInputStream bins = new ByteArrayInputStream(input);
+		ByteArrayOutputStream bous = new ByteArrayOutputStream();
+		if (ctx.mode == SM4_ENCRYPT)
+		{
+			for(; length > 0; length -= 16)
+			{
+				byte[] in = new byte[16];
+				byte[] out = new byte[16];
+				byte[] out1 = new byte[16];
+
+				bins.read(in);
+				for (i = 0; i < 16; i++)
+				{
+					out[i] = ((byte) (in[i] ^ iv[i]));
+				}
+				sm4_one_round(ctx.sk, out, out1);
+				System.arraycopy(out1, 0, iv, 0, 16);
+				bous.write(out1);
+			}
+		}
+		else
+		{
+			byte[] temp = new byte[16];
+			for(; length > 0; length -= 16)
+			{
+				byte[] in = new byte[16];
+				byte[] out = new byte[16];
+				byte[] out1 = new byte[16];
+
+				bins.read(in);
+				System.arraycopy(in, 0, temp, 0, 16);
+				sm4_one_round(ctx.sk, in, out);
+				for (i = 0; i < 16; i++)
+				{
+					out1[i] = ((byte) (out[i] ^ iv[i]));
+				}
+				System.arraycopy(temp, 0, iv, 0, 16);
+				bous.write(out1);
+			}
+		}
+
+		byte[] output = bous.toByteArray();
+		if (ctx.isPadding && ctx.mode == SM4_DECRYPT)
+		{
+			output = padding(output, SM4_DECRYPT);
+		}
+		bins.close();
+		bous.close();
+		return output;
+	}
+}

hazard-stateSecrets/src/main/java/com/ozs/stateSecrets/utils/SM4Context.java

@@ -0,0 +1,17 @@
+package com.ozs.stateSecrets.utils;
+
+public class SM4Context
+{
+	public int mode;
+
+	public long[] sk;
+
+	public boolean isPadding;
+
+	public SM4Context()
+	{
+		this.mode = 1;
+		this.isPadding = true;
+		this.sk = new long[32];
+	}
+}

hazard-stateSecrets/src/main/java/com/ozs/stateSecrets/utils/SM4Utils.java

@@ -0,0 +1,167 @@
+package com.ozs.stateSecrets.utils;
+
+import org.apache.commons.codec.binary.Base64;
+
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+
+public class SM4Utils
+{
+	public String iv = "";
+
+	private boolean hexString = false;
+	public static Pattern p = Pattern.compile("\\s*|\t|\r|\n");
+	public SM4Utils()
+	{
+	}
+
+	public static String encryptData_ECB(String plainText, String secretKey)
+	{
+		try
+		{
+			SM4Context ctx = new SM4Context();
+			ctx.isPadding = true;
+			ctx.mode = SM4.SM4_ENCRYPT;
+			byte[] keyBytes;
+			keyBytes = secretKey.getBytes(StandardCharsets.UTF_8);
+			SM4 sm4 = new SM4();
+			sm4.sm4_setkey_enc(ctx, keyBytes);
+			byte[] encrypted = sm4.sm4_crypt_ecb(ctx, plainText.getBytes(StandardCharsets.UTF_8));
+			String cipherText = Base64.encodeBase64String(encrypted);
+			if (cipherText != null && cipherText.trim().length() > 0)
+			{
+				Matcher m = p.matcher(cipherText);
+				cipherText = m.replaceAll("");
+			}
+			return cipherText;
+		}
+		catch (Exception e)
+		{
+			e.printStackTrace();
+			return null;
+		}
+	}
+
+	public static  String decryptData_ECB(String cipherText, String secretKey)
+	{
+		try
+		{
+			SM4Context ctx = new SM4Context();
+			ctx.isPadding = true;
+			ctx.mode = SM4.SM4_DECRYPT;
+			byte[] keyBytes;
+			keyBytes = secretKey.getBytes(StandardCharsets.UTF_8);
+			SM4 sm4 = new SM4();
+			sm4.sm4_setkey_dec(ctx, keyBytes);
+			byte[] decrypted = sm4.sm4_crypt_ecb(ctx, Base64.decodeBase64(cipherText));
+			return new String(decrypted, StandardCharsets.UTF_8);
+		}
+		catch (Exception e)
+		{
+			e.printStackTrace();
+			return null;
+		}
+	}
+
+	public String encryptData_CBC(String plainText, String secretKey)
+	{
+		try
+		{
+			SM4Context ctx = new SM4Context();
+			ctx.isPadding = true;
+			ctx.mode = SM4.SM4_ENCRYPT;
+
+			byte[] keyBytes;
+			byte[] ivBytes;
+			if (hexString)
+			{
+				keyBytes = Util.hexStringToBytes(secretKey);
+				ivBytes = Util.hexStringToBytes(iv);
+			}
+			else
+			{
+				keyBytes = secretKey.getBytes(StandardCharsets.UTF_8);
+				ivBytes = iv.getBytes(StandardCharsets.UTF_8);
+			}
+
+			SM4 sm4 = new SM4();
+			sm4.sm4_setkey_enc(ctx, keyBytes);
+			byte[] encrypted = sm4.sm4_crypt_cbc(ctx, ivBytes, plainText.getBytes(StandardCharsets.UTF_8));
+			String cipherText = Base64.encodeBase64String(encrypted);
+			if (cipherText != null && cipherText.trim().length() > 0)
+			{
+				Matcher m = p.matcher(cipherText);
+				cipherText = m.replaceAll("");
+			}
+			return cipherText;
+		}
+		catch (Exception e)
+		{
+			e.printStackTrace();
+			return null;
+		}
+	}
+
+	public String decryptData_CBC(String cipherText, String secretKey)
+	{
+		try
+		{
+			SM4Context ctx = new SM4Context();
+			ctx.isPadding = true;
+			ctx.mode = SM4.SM4_DECRYPT;
+
+			byte[] keyBytes;
+			byte[] ivBytes;
+			if (hexString)
+			{
+				keyBytes = Util.hexStringToBytes(secretKey);
+				ivBytes = Util.hexStringToBytes(iv);
+			}
+			else
+			{
+				keyBytes = secretKey.getBytes(StandardCharsets.UTF_8);
+				ivBytes = iv.getBytes(StandardCharsets.UTF_8);
+			}
+
+			SM4 sm4 = new SM4();
+			sm4.sm4_setkey_dec(ctx, keyBytes);
+			byte[] decrypted = sm4.sm4_crypt_cbc(ctx, ivBytes, Base64.decodeBase64(cipherText));
+			return new String(decrypted, StandardCharsets.UTF_8);
+		}
+		catch (Exception e)
+		{
+			e.printStackTrace();
+			return null;
+		}
+	}
+
+	public static void main(String[] args) throws IOException
+	{
+		String plainText = "abcd";
+
+		SM4Utils sm4 = new SM4Utils();
+		sm4.hexString = false;
+
+		System.out.println("ECBģʽ");
+		String cipherText = sm4.encryptData_ECB(plainText,"4370780c9a8c43e5");
+		System.out.println("加密后: " + cipherText);
+		System.out.println("");
+
+		plainText = sm4.decryptData_ECB(cipherText,"4370780c9a8c43e5");
+		System.out.println("解密后: " + plainText);
+		System.out.println("");
+
+		System.out.println("大");
+		sm4.iv = "UISwD9fW6cFh9SNS";
+		cipherText = sm4.encryptData_CBC(plainText,"4370780c9a8c43e5");
+		System.out.println("加密后: " + cipherText);
+		System.out.println("");
+
+		plainText = sm4.decryptData_CBC(cipherText,"4370780c9a8c43e5");
+		System.out.println("解密后: " + plainText);
+	}
+
+}

hazard-stateSecrets/src/main/java/com/ozs/stateSecrets/utils/Sm2KeyPair.java

@@ -0,0 +1,43 @@
+package com.ozs.stateSecrets.utils;
+
+
+
+public class Sm2KeyPair {
+    private byte[] priKey;
+    private byte[] pubKey;
+    public Sm2KeyPair(byte[] priKey, byte[] pubKey){
+        this.priKey = priKey;
+        this.pubKey = pubKey;
+    }
+
+    public byte[] getPriKey() {
+        return this.priKey;
+    }
+
+    public void setPriKey(byte[] priKey) {
+        this.priKey = priKey;
+    }
+
+    public byte[] getPubKey() {
+        return this.pubKey;
+    }
+
+    public void setPubKey(byte[] pubKey) {
+        this.pubKey = pubKey;
+    }
+
+    public String getPriKeyStr(){
+        return Util.getHexString(this.priKey);
+    }
+    public String getPubKeyStr() {
+        return Util.getHexString(this.pubKey);
+    }
+
+    @Override
+    public String toString() {
+        return "Sm2KeyPair{" +
+                "priKey=" + this.getPriKeyStr() +
+                ", pubKey=" + this.getPubKeyStr() +
+                '}';
+    }
+}

hazard-stateSecrets/src/main/java/com/ozs/stateSecrets/utils/Util.java

@@ -0,0 +1,662 @@
+package com.ozs.stateSecrets.utils;
+
+import java.math.BigInteger;
+
+public class Util
+{
+	/**
+	 * 整形转换成网络传输的字节流（字节数组）型数据
+	 *
+	 * @param num 一个整型数据
+	 * @return 4个字节的自己数组
+	 */
+	public static byte[] intToBytes(int num)
+	{
+		byte[] bytes = new byte[4];
+		bytes[0] = (byte) (0xff & (num >> 0));
+		bytes[1] = (byte) (0xff & (num >> 8));
+		bytes[2] = (byte) (0xff & (num >> 16));
+		bytes[3] = (byte) (0xff & (num >> 24));
+		return bytes;
+	}
+
+	/**
+	 * 四个字节的字节数据转换成一个整形数据
+	 *
+	 * @param bytes 4个字节的字节数组
+	 * @return 一个整型数据
+	 */
+	public static int byteToInt(byte[] bytes)
+	{
+		int num = 0;
+		int temp;
+		temp = (0x000000ff & (bytes[0])) << 0;
+		num = num | temp;
+		temp = (0x000000ff & (bytes[1])) << 8;
+		num = num | temp;
+		temp = (0x000000ff & (bytes[2])) << 16;
+		num = num | temp;
+		temp = (0x000000ff & (bytes[3])) << 24;
+		num = num | temp;
+		return num;
+	}
+
+	/**
+	 * 长整形转换成网络传输的字节流（字节数组）型数据
+	 *
+	 * @param num 一个长整型数据
+	 * @return 4个字节的自己数组
+	 */
+	public static byte[] longToBytes(long num)
+	{
+		byte[] bytes = new byte[8];
+		for (int i = 0; i < 8; i++)
+		{
+			bytes[i] = (byte) (0xff & (num >> (i * 8)));
+		}
+
+		return bytes;
+	}
+
+	/**
+	 * 大数字转换字节流（字节数组）型数据
+	 *
+	 * @param n
+	 * @return
+	 */
+	public static byte[] byteConvert32Bytes(BigInteger n)
+	{
+		byte tmpd[] = (byte[])null;
+        if(n == null)
+        {
+        	return null;
+        }
+
+        if(n.toByteArray().length == 33)
+        {
+            tmpd = new byte[32];
+            System.arraycopy(n.toByteArray(), 1, tmpd, 0, 32);
+        }
+        else if(n.toByteArray().length == 32)
+        {
+            tmpd = n.toByteArray();
+        }
+        else
+        {
+            tmpd = new byte[32];
+            for(int i = 0; i < 32 - n.toByteArray().length; i++)
+            {
+            	tmpd[i] = 0;
+            }
+            System.arraycopy(n.toByteArray(), 0, tmpd, 32 - n.toByteArray().length, n.toByteArray().length);
+        }
+        return tmpd;
+	}
+
+	/**
+	 * 换字节流（字节数组）型数据转大数字
+	 *
+	 * @param b
+	 * @return
+	 */
+	public static BigInteger byteConvertInteger(byte[] b)
+	{
+	    if (b[0] < 0)
+	    {
+	    	byte[] temp = new byte[b.length + 1];
+	    	temp[0] = 0;
+	    	System.arraycopy(b, 0, temp, 1, b.length);
+	    	return new BigInteger(temp);
+	    }
+	    return new BigInteger(b);
+	}
+
+	/**
+	 * 根据字节数组获得值(十六进制数字)
+	 *
+	 * @param bytes
+	 * @return
+	 */
+	public static String getHexString(byte[] bytes)
+	{
+		return getHexString(bytes, true);
+	}
+
+	/**
+	 * 根据字节数组获得值(十六进制数字)
+	 *
+	 * @param bytes
+	 * @param upperCase
+	 * @return
+	 */
+	public static String getHexString(byte[] bytes, boolean upperCase)
+	{
+		String ret = "";
+		for (int i = 0; i < bytes.length; i++)
+		{
+			ret += Integer.toString((bytes[i] & 0xff) + 0x100, 16).substring(1);
+		}
+		return upperCase ? ret.toUpperCase() : ret;
+	}
+
+	/**
+	 * 打印十六进制字符串
+	 *
+	 * @param bytes
+	 */
+	public static void printHexString(byte[] bytes)
+	{
+		for (int i = 0; i < bytes.length; i++)
+		{
+			String hex = Integer.toHexString(bytes[i] & 0xFF);
+			if (hex.length() == 1)
+			{
+				hex = '0' + hex;
+			}
+			System.out.print("0x" + hex.toUpperCase() + ",");
+		}
+		System.out.println("");
+	}
+
+	/**
+	 * Convert hex string to byte[]
+	 *
+	 * @param hexString
+	 *            the hex string
+	 * @return byte[]
+	 */
+	public static byte[] hexStringToBytes(String hexString)
+	{
+		if (hexString == null || hexString.equals(""))
+		{
+			return null;
+		}
+
+		hexString = hexString.toUpperCase();
+		int length = hexString.length() / 2;
+		char[] hexChars = hexString.toCharArray();
+		byte[] d = new byte[length];
+		for (int i = 0; i < length; i++)
+		{
+			int pos = i * 2;
+			d[i] = (byte) (charToByte(hexChars[pos]) << 4 | charToByte(hexChars[pos + 1]));
+		}
+		return d;
+	}
+
+	/**
+	 * Convert char to byte
+	 *
+	 * @param c
+	 *            char
+	 * @return byte
+	 */
+	public static byte charToByte(char c)
+	{
+		return (byte) "0123456789ABCDEF".indexOf(c);
+	}
+
+	/**
+     * 用于建立十六进制字符的输出的小写字符数组
+     */
+    private static final char[] DIGITS_LOWER = {'0', '1', '2', '3', '4', '5',
+            '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'};
+
+    /**
+     * 用于建立十六进制字符的输出的大写字符数组
+     */
+    private static final char[] DIGITS_UPPER = {'0', '1', '2', '3', '4', '5',
+            '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F'};
+
+    /**
+     * 将字节数组转换为十六进制字符数组
+     *
+     * @param data byte[]
+     * @return 十六进制char[]
+     */
+    public static char[] encodeHex(byte[] data) {
+        return encodeHex(data, true);
+    }
+
+    /**
+     * 将字节数组转换为十六进制字符数组
+     *
+     * @param data        byte[]
+     * @param toLowerCase <code>true</code> 传换成小写格式 ， <code>false</code> 传换成大写格式
+     * @return 十六进制char[]
+     */
+    public static char[] encodeHex(byte[] data, boolean toLowerCase) {
+        return encodeHex(data, toLowerCase ? DIGITS_LOWER : DIGITS_UPPER);
+    }
+
+    /**
+     * 将字节数组转换为十六进制字符数组
+     *
+     * @param data     byte[]
+     * @param toDigits 用于控制输出的char[]
+     * @return 十六进制char[]
+     */
+    protected static char[] encodeHex(byte[] data, char[] toDigits) {
+        int l = data.length;
+        char[] out = new char[l << 1];
+        // two characters form the hex value.
+        for (int i = 0, j = 0; i < l; i++) {
+            out[j++] = toDigits[(0xF0 & data[i]) >>> 4];
+            out[j++] = toDigits[0x0F & data[i]];
+        }
+        return out;
+    }
+
+    /**
+     * 将字节数组转换为十六进制字符串
+     *
+     * @param data byte[]
+     * @return 十六进制String
+     */
+    public static String encodeHexString(byte[] data) {
+        return encodeHexString(data, true);
+    }
+
+    /**
+     * 将字节数组转换为十六进制字符串
+     *
+     * @param data        byte[]
+     * @param toLowerCase <code>true</code> 传换成小写格式 ， <code>false</code> 传换成大写格式
+     * @return 十六进制String
+     */
+    public static String encodeHexString(byte[] data, boolean toLowerCase) {
+        return encodeHexString(data, toLowerCase ? DIGITS_LOWER : DIGITS_UPPER);
+    }
+
+    /**
+     * 将字节数组转换为十六进制字符串
+     *
+     * @param data     byte[]
+     * @param toDigits 用于控制输出的char[]
+     * @return 十六进制String
+     */
+    protected static String encodeHexString(byte[] data, char[] toDigits) {
+        return new String(encodeHex(data, toDigits));
+    }
+
+    /**
+     * 将十六进制字符数组转换为字节数组
+     *
+     * @param data 十六进制char[]
+     * @return byte[]
+     * @throws RuntimeException 如果源十六进制字符数组是一个奇怪的长度，将抛出运行时异常
+     */
+    public static byte[] decodeHex(char[] data) {
+        int len = data.length;
+
+        if ((len & 0x01) != 0) {
+            throw new RuntimeException("Odd number of characters.");
+        }
+
+        byte[] out = new byte[len >> 1];
+
+        // two characters form the hex value.
+        for (int i = 0, j = 0; j < len; i++) {
+            int f = toDigit(data[j], j) << 4;
+            j++;
+            f = f | toDigit(data[j], j);
+            j++;
+            out[i] = (byte) (f & 0xFF);
+        }
+
+        return out;
+    }
+
+    /**
+     * 将十六进制字符转换成一个整数
+     *
+     * @param ch    十六进制char
+     * @param index 十六进制字符在字符数组中的位置
+     * @return 一个整数
+     * @throws RuntimeException 当ch不是一个合法的十六进制字符时，抛出运行时异常
+     */
+    protected static int toDigit(char ch, int index) {
+        int digit = Character.digit(ch, 16);
+        if (digit == -1) {
+            throw new RuntimeException("Illegal hexadecimal character " + ch
+                    + " at index " + index);
+        }
+        return digit;
+    }
+
+    /**
+     * 数字字符串转ASCII码字符串
+     *
+     * @param String
+     *            字符串
+     * @return ASCII字符串
+     */
+    public static String StringToAsciiString(String content) {
+        String result = "";
+        int max = content.length();
+        for (int i = 0; i < max; i++) {
+            char c = content.charAt(i);
+            String b = Integer.toHexString(c);
+            result = result + b;
+        }
+        return result;
+    }
+
+    /**
+     * 十六进制转字符串
+     *
+     * @param hexString
+     *            十六进制字符串
+     * @param encodeType
+     *            编码类型4：Unicode，2：普通编码
+     * @return 字符串
+     */
+    public static String hexStringToString(String hexString, int encodeType) {
+        String result = "";
+        int max = hexString.length() / encodeType;
+        for (int i = 0; i < max; i++) {
+            char c = (char) hexStringToAlgorism(hexString
+                    .substring(i * encodeType, (i + 1) * encodeType));
+            result += c;
+        }
+        return result;
+    }
+
+    /**
+     * 十六进制字符串装十进制
+     *
+     * @param hex
+     *            十六进制字符串
+     * @return 十进制数值
+     */
+    public static int hexStringToAlgorism(String hex) {
+        hex = hex.toUpperCase();
+        int max = hex.length();
+        int result = 0;
+        for (int i = max; i > 0; i--) {
+            char c = hex.charAt(i - 1);
+            int algorism = 0;
+            if (c >= '0' && c <= '9') {
+                algorism = c - '0';
+            } else {
+                algorism = c - 55;
+            }
+            result += Math.pow(16, max - i) * algorism;
+        }
+        return result;
+    }
+
+    /**
+     * 十六转二进制
+     *
+     * @param hex
+     *            十六进制字符串
+     * @return 二进制字符串
+     */
+    public static String hexStringToBinary(String hex) {
+        hex = hex.toUpperCase();
+        String result = "";
+        int max = hex.length();
+        for (int i = 0; i < max; i++) {
+            char c = hex.charAt(i);
+            switch (c) {
+            case '0':
+                result += "0000";
+                break;
+            case '1':
+                result += "0001";
+                break;
+            case '2':
+                result += "0010";
+                break;
+            case '3':
+                result += "0011";
+                break;
+            case '4':
+                result += "0100";
+                break;
+            case '5':
+                result += "0101";
+                break;
+            case '6':
+                result += "0110";
+                break;
+            case '7':
+                result += "0111";
+                break;
+            case '8':
+                result += "1000";
+                break;
+            case '9':
+                result += "1001";
+                break;
+            case 'A':
+                result += "1010";
+                break;
+            case 'B':
+                result += "1011";
+                break;
+            case 'C':
+                result += "1100";
+                break;
+            case 'D':
+                result += "1101";
+                break;
+            case 'E':
+                result += "1110";
+                break;
+            case 'F':
+                result += "1111";
+                break;
+            }
+        }
+        return result;
+    }
+
+    /**
+     * ASCII码字符串转数字字符串
+     *
+     * @param String
+     *            ASCII字符串
+     * @return 字符串
+     */
+    public static String AsciiStringToString(String content) {
+        String result = "";
+        int length = content.length() / 2;
+        for (int i = 0; i < length; i++) {
+            String c = content.substring(i * 2, i * 2 + 2);
+            int a = hexStringToAlgorism(c);
+            char b = (char) a;
+            String d = String.valueOf(b);
+            result += d;
+        }
+        return result;
+    }
+
+    /**
+     * 将十进制转换为指定长度的十六进制字符串
+     *
+     * @param algorism
+     *            int 十进制数字
+     * @param maxLength
+     *            int 转换后的十六进制字符串长度
+     * @return String 转换后的十六进制字符串
+     */
+    public static String algorismToHexString(int algorism, int maxLength) {
+        String result = "";
+        result = Integer.toHexString(algorism);
+
+        if (result.length() % 2 == 1) {
+            result = "0" + result;
+        }
+        return patchHexString(result.toUpperCase(), maxLength);
+    }
+
+    /**
+     * 字节数组转为普通字符串（ASCII对应的字符）
+     *
+     * @param bytearray
+     *            byte[]
+     * @return String
+     */
+    public static String byteToString(byte[] bytearray) {
+        String result = "";
+        char temp;
+
+        int length = bytearray.length;
+        for (int i = 0; i < length; i++) {
+            temp = (char) bytearray[i];
+            result += temp;
+        }
+        return result;
+    }
+
+    /**
+     * 二进制字符串转十进制
+     *
+     * @param binary
+     *            二进制字符串
+     * @return 十进制数值
+     */
+    public static int binaryToAlgorism(String binary) {
+        int max = binary.length();
+        int result = 0;
+        for (int i = max; i > 0; i--) {
+            char c = binary.charAt(i - 1);
+            int algorism = c - '0';
+            result += Math.pow(2, max - i) * algorism;
+        }
+        return result;
+    }
+
+    /**
+     * 十进制转换为十六进制字符串
+     *
+     * @param algorism
+     *            int 十进制的数字
+     * @return String 对应的十六进制字符串
+     */
+    public static String algorismToHEXString(int algorism) {
+        String result = "";
+        result = Integer.toHexString(algorism);
+
+        if (result.length() % 2 == 1) {
+            result = "0" + result;
+
+        }
+        result = result.toUpperCase();
+
+        return result;
+    }
+
+    /**
+     * HEX字符串前补0，主要用于长度位数不足。
+     *
+     * @param str
+     *            String 需要补充长度的十六进制字符串
+     * @param maxLength
+     *            int 补充后十六进制字符串的长度
+     * @return 补充结果
+     */
+    static public String patchHexString(String str, int maxLength) {
+        String temp = "";
+        for (int i = 0; i < maxLength - str.length(); i++) {
+            temp = "0" + temp;
+        }
+        str = (temp + str).substring(0, maxLength);
+        return str;
+    }
+
+    /**
+     * 将一个字符串转换为int
+     *
+     * @param s
+     *            String 要转换的字符串
+     * @param defaultInt
+     *            int 如果出现异常,默认返回的数字
+     * @param radix
+     *            int 要转换的字符串是什么进制的,如16 8 10.
+     * @return int 转换后的数字
+     */
+    public static int parseToInt(String s, int defaultInt, int radix) {
+        int i = 0;
+        try {
+            i = Integer.parseInt(s, radix);
+        } catch (NumberFormatException ex) {
+            i = defaultInt;
+        }
+        return i;
+    }
+
+    /**
+     * 将一个十进制形式的数字字符串转换为int
+     *
+     * @param s
+     *            String 要转换的字符串
+     * @param defaultInt
+     *            int 如果出现异常,默认返回的数字
+     * @return int 转换后的数字
+     */
+    public static int parseToInt(String s, int defaultInt) {
+        int i = 0;
+        try {
+            i = Integer.parseInt(s);
+        } catch (NumberFormatException ex) {
+            i = defaultInt;
+        }
+        return i;
+    }
+
+    /**
+     * 十六进制串转化为byte数组
+     *
+     * @return the array of byte
+     */
+    public static byte[] hexToByte(String hex)
+            throws IllegalArgumentException {
+        if (hex.length() % 2 != 0) {
+            throw new IllegalArgumentException();
+        }
+        char[] arr = hex.toCharArray();
+        byte[] b = new byte[hex.length() / 2];
+        for (int i = 0, j = 0, l = hex.length(); i < l; i++, j++) {
+            String swap = "" + arr[i++] + arr[i];
+            int byteint = Integer.parseInt(swap, 16) & 0xFF;
+            b[j] = new Integer(byteint).byteValue();
+        }
+        return b;
+    }
+
+    /**
+     * 字节数组转换为十六进制字符串
+     *
+     * @param b
+     *            byte[] 需要转换的字节数组
+     * @return String 十六进制字符串
+     */
+    public static String byteToHex(byte b[]) {
+        if (b == null) {
+            throw new IllegalArgumentException(
+                    "Argument b ( byte array ) is null! ");
+        }
+        String hs = "";
+        String stmp = "";
+        for (int n = 0; n < b.length; n++) {
+            stmp = Integer.toHexString(b[n] & 0xff);
+            if (stmp.length() == 1) {
+                hs = hs + "0" + stmp;
+            } else {
+                hs = hs + stmp;
+            }
+        }
+        return hs.toUpperCase();
+    }
+
+    public static byte[] subByte(byte[] input, int startIndex, int length) {
+		byte[] bt = new byte[length];
+		for (int i = 0; i < length; i++) {
+			bt[i] = input[i + startIndex];
+		}
+		return bt;
+    }
+}

pom.xml

@@ -73,6 +73,7 @@
         <module>hazard-admin</module>
         <module>business-service</module>
         <module>hazard-sdk</module>
+        <module>hazard-stateSecrets</module>
     </modules>