代码提交git

core-db/src/main/java/2020-2-24/sequence/SIGN_INFO_HCLC_FACE.sql

+-- Create table
+create table SIGN_INFO_HCLC_FACE
+(
+  FACEAUTH_ID           NUMBER not null,
+  OPEN_ID               VARCHAR2(30) not null,
+  FACEAUTH_STATUS       VARCHAR2(30),
+  URL                   VARCHAR2(2000),
+  SHORT_LINK            VARCHAR2(2000),
+  RETURN_CODE           VARCHAR2(30),
+  RETURN_MESSAGE        VARCHAR2(2000),
+  OBJECT_VERSION_NUMBER NUMBER(38) default 1,
+  REQUEST_ID            NUMBER(38) default -1,
+  PROGRAM_ID            NUMBER(38) default -1,
+  CREATED_BY            NUMBER(38) default -1,
+  CREATION_DATE         TIMESTAMP(6) default CURRENT_TIMESTAMP,
+  LAST_UPDATED_BY       NUMBER(38) default -1,
+  LAST_UPDATE_DATE      TIMESTAMP(6) default CURRENT_TIMESTAMP,
+  LAST_UPDATE_LOGIN     NUMBER(38) default -1,
+  FLOW_ID               VARCHAR2(30)
+);
+-- Add comments to the columns 
+comment on column SIGN_INFO_HCLC_FACE.OPEN_ID
+  is '微信openid';
+comment on column SIGN_INFO_HCLC_FACE.FACEAUTH_STATUS
+  is '人脸认证结果';
+comment on column SIGN_INFO_HCLC_FACE.URL
+  is '认证地址原始链接';
+comment on column SIGN_INFO_HCLC_FACE.SHORT_LINK
+  is '认证地址短连接';
+comment on column SIGN_INFO_HCLC_FACE.FLOW_ID
+  is '认证流程Id';
+-- Create/Recreate primary, unique and foreign key constraints 
+alter table SIGN_INFO_HCLC_FACE
+  add constraint SIGN_INFO_HCLC_FACE_PK primary key (FACEAUTH_ID)
+  using index ;

core-db/src/main/java/2020-2-24/sequence/SIGN_INFO_HCLC_FACE_S.sql

+-- Create sequence 
+create sequence SIGN_INFO_HCLC_FACE_S
+minvalue 1
+maxvalue 9999999999999999999999999999
+start with 10001
+increment by 1
+cache 20;

core-db/src/main/java/2020-2-24/table/sign_info_hclc.sql

+-- Create table
+create table SIGN_INFO_HCLC
+(
+  OPEN_ID               VARCHAR2(30) not null,
+  ID_NO                 VARCHAR2(30) not null,
+  NAME                  VARCHAR2(200) not null,
+  MOBILE                VARCHAR2(30) not null,
+  EMAIL                 VARCHAR2(30),
+  ORIGIN_ID             VARCHAR2(30),
+  TITLE                 VARCHAR2(200),
+  ADDRESS               VARCHAR2(300),
+  ACCOUNT_ID            VARCHAR2(30),
+  FACEAUTH_STATUS       VARCHAR2(30),
+  CTITYPE               NUMBER,
+  AGENT_TYPE            NUMBER,
+  AGENT_ID_NO           VARCHAR2(30),
+  AGENT_NAME            VARCHAR2(30),
+  LEGAL_ID_NO           VARCHAR2(30),
+  LEGAL_NAME            VARCHAR2(30),
+  OBJECT_VERSION_NUMBER NUMBER(38) default 1,
+  REQUEST_ID            NUMBER(38) default -1,
+  PROGRAM_ID            NUMBER(38) default -1,
+  CREATED_BY            NUMBER(38) default -1,
+  CREATION_DATE         TIMESTAMP(6) default CURRENT_TIMESTAMP,
+  LAST_UPDATED_BY       NUMBER(38) default -1,
+  LAST_UPDATE_DATE      TIMESTAMP(6) default CURRENT_TIMESTAMP,
+  LAST_UPDATE_LOGIN     NUMBER(38) default -1
+);
+-- Add comments to the columns 
+comment on column SIGN_INFO_HCLC.OPEN_ID
+  is '微信openid';
+comment on column SIGN_INFO_HCLC.ID_NO
+  is '身份证件号（组织机构号）';
+comment on column SIGN_INFO_HCLC.NAME
+  is '用户名称（组织机构名称）';
+comment on column SIGN_INFO_HCLC.MOBILE
+  is '手机号';
+comment on column SIGN_INFO_HCLC.EMAIL
+  is '邮件';
+comment on column SIGN_INFO_HCLC.ORIGIN_ID
+  is '原始用户id';
+comment on column SIGN_INFO_HCLC.CTITYPE
+  is '用户类型(1-个人，2-法人)';
+comment on column SIGN_INFO_HCLC.AGENT_TYPE
+  is '经办人类型(1-组织其他员工，2-法定代表人)';
+comment on column SIGN_INFO_HCLC.AGENT_ID_NO
+  is '经办人身份证号码';
+comment on column SIGN_INFO_HCLC.AGENT_NAME
+  is '经办人姓名';
+comment on column SIGN_INFO_HCLC.LEGAL_ID_NO
+  is '法定代表人身份证号码';
+comment on column SIGN_INFO_HCLC.LEGAL_NAME
+  is '法定代表人姓名';
+-- Create/Recreate primary, unique and foreign key constraints 
+alter table SIGN_INFO_HCLC
+  add constraint SIGN_INFO_HCLC_PK primary key (OPEN_ID)
+  using index;
+-- Create/Recreate indexes 
+create index SIGN_INFO_HCLC_N1 on SIGN_INFO_HCLC (ID_NO, OPEN_ID);

core/pom.xml

@@ -225,6 +225,16 @@
                 ${project.basedir}/src/main/webapp/WEB-INF/lib/aliyun-java-sdk-dysmsapi-1.0.0-SANPSHOT.jar
             </systemPath>
         </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <version>RELEASE</version>
+        </dependency>
+        <dependency>
+            <groupId>com.baidu.aip</groupId>
+            <artifactId>java-sdk</artifactId>
+            <version>4.12.0</version>
+        </dependency>
         <!-- <dependency>
             <groupId>com.hand</groupId>
             <artifactId>hap-db</artifactId>

core/src/main/java/com/hand/app/esignHclc/controllers/SignHclcController.java

@@ -212,7 +212,14 @@ public class SignHclcController extends BaseController {
             dto.setCreateMessage("");
 
             //注销经办人用户
-            map = signHclcService.deletePersonAccount(iRequest, dto);
+            //初始化经办人人脸识别信息
+            SignUserInfoHclc agentSignInfo = new SignUserInfoHclc();
+            agentSignInfo.setOpenId(dto.getOpenId());
+            agentSignInfo.setIdNo(dto.getAgentIdNo());
+            agentSignInfo.setMobile(dto.getMobile());
+            agentSignInfo.setName(dto.getAgentName());
+            agentSignInfo.setAccountId(dto.getAgentAccountId());
+            map = signHclcService.deletePersonAccount(iRequest, agentSignInfo);
             if ("0".equalsIgnoreCase(map.get("code").toString()) || "40051667".equalsIgnoreCase(map.get("code").toString()) || "000003".equalsIgnoreCase(map.get("code").toString())) {
                 signHclcService.deleteByPrimaryKey(dto);
             } else {
@@ -301,4 +308,36 @@ public class SignHclcController extends BaseController {
                                       @RequestBody(required = true) JSONObject params) {
         return signHclcService.createSignFlows(createRequestContext(request), params);
     }
+
+
+    /**
+     * 创建印章
+     *
+     * @param request
+     * @param dto     创建签署流程
+     * @return Map
+     */
+    @ResponseBody
+    @RequestMapping(value = "/sign/seal/create", method = RequestMethod.POST)
+    public JSONObject createPersonSeal(HttpServletRequest request,
+                                      @RequestBody SignUserInfoHclc dto) {
+        JSONObject json = new JSONObject();
+        String sealId = signHclcService.createTemplateSeals(dto.getAccountId(), dto.getOpenId());
+        json.put("sealId", sealId);
+        return json;
+    }
+
+//    /**
+//     * 创建签署流程
+//     *
+//     * @param request
+//     * @param params  创建签署流程
+//     * @return Map
+//     */
+//    @ResponseBody
+//    @RequestMapping(value = "/sign/flows/cancel", method = RequestMethod.POST)
+//    public JSONObject cancelSignFlows(HttpServletRequest request,
+//                                      @RequestBody(required = true) JSONObject params) {
+//        return signHclcService.cancelSignFlows(createRequestContext(request), params);
+//    }
 }

core/src/main/java/com/hand/app/esignHclc/dto/SignUserInfoHclc.java

@@ -50,6 +50,10 @@ public class SignUserInfoHclc extends BaseDTO {
 
     private String authFlag; // 用户通过认证状态
 
+    private String dealerFlag; // 是否代理店
+
+    private String sealId; // 是否代理店
+
     @Transient
     private String attachmentId;//身份证附件id
 
@@ -346,4 +350,20 @@ public class SignUserInfoHclc extends BaseDTO {
     public void setAuthFlag(String authFlag) {
         this.authFlag = authFlag;
     }
+
+    public String getDealerFlag() {
+        return dealerFlag;
+    }
+
+    public void setDealerFlag(String dealerFlag) {
+        this.dealerFlag = dealerFlag;
+    }
+
+    public String getSealId() {
+        return sealId;
+    }
+
+    public void setSealId(String sealId) {
+        this.sealId = sealId;
+    }
 }

core/src/main/java/com/hand/app/esignHclc/service/ISignInfoHclcService.java

@@ -35,5 +35,9 @@ public interface ISignInfoHclcService extends IBaseService<SignUserInfoHclc>, Pr
 
     JSONObject createSignFlows(IRequest requestContext, JSONObject params);
 
+    String createTemplateSeals(String accountId, String openId);
+
+//    JSONObject cancelSignFlows(IRequest requestContext, JSONObject params);
+
     void postSignFlowsResult(IRequest iRequest, JSONObject params);
 }

core/src/main/java/com/hand/app/esignHclc/utils/SignHclcUtils.java

@@ -10,11 +10,14 @@ import com.hand.app.esignHclc.dto.SignUserInfoHclc;
 import com.alibaba.fastjson.JSONObject;
 import org.apache.commons.codec.binary.Base64;
 import org.apache.http.HttpResponse;
+import org.apache.http.NameValuePair;
 import org.apache.http.client.HttpClient;
+import org.apache.http.client.entity.UrlEncodedFormEntity;
 import org.apache.http.client.methods.HttpPost;
 import org.apache.http.entity.StringEntity;
 import org.apache.http.impl.client.HttpClientBuilder;
 import org.apache.http.message.BasicHeader;
+import org.apache.http.message.BasicNameValuePair;
 
 import javax.crypto.Cipher;
 import javax.crypto.KeyGenerator;
@@ -41,6 +44,8 @@ public class SignHclcUtils {
     public static final String APP_ID = "18653557";
     public static final String API_KEY = "VD5jNFLsuBQE4vvjTtQoKQtt";
     public static final String SECRET_KEY = "Bx1O0kQ7W9YDprTOaLr2MPcPupsn7w7z";
+    public static final String APPLICATION_JSON = "application/json";
+    public static final String APPLICATION_FORM_URLENCODED = "application/x-www-form-urlencoded";
 
     public SignHclcUtils() {
     }
@@ -62,25 +67,39 @@ public class SignHclcUtils {
     /**
      * 向指定URL发送POST方法的请求
      *
-     * @param urls 发送请求的URL
-     * @param json 请求参数，请求参数应该是 JSON 的形式。
+     * @param urls   发送请求的URL
+     * @param params 请求参数，请求参数应该是 JSON 的形式。
      * @return URL 所代表远程资源的响应结果
      */
-    public String postString(String urls, String json, Map<String, String> headInfo) {
+    public String postString(String urls, JSONObject params, Map<String, String> headInfo, String contentType) {
         HttpClient client = HttpClientBuilder.create().build();
         HttpPost post = new HttpPost(urls);
-        post.setHeader("Content-Type", "application/json");
         String result = "";
 
         try {
-            StringEntity s = new StringEntity(json, "utf-8");
-            s.setContentEncoding(new BasicHeader("Content-Type", "application/json"));
+
             if (Objects.nonNull(headInfo)) {
                 for (Map.Entry<String, String> entry : headInfo.entrySet()) {
                     post.setHeader(entry.getKey(), entry.getValue());
                 }
             }
-            post.setEntity(s);
+
+            if (APPLICATION_JSON.equalsIgnoreCase(contentType)) {
+                String json = params.toString();
+                StringEntity s = new StringEntity(json, "utf-8");
+                s.setContentEncoding(new BasicHeader("Content-Type", APPLICATION_JSON));
+                post.setHeader("Content-Type", APPLICATION_JSON);
+                post.setEntity(s);
+            } else if (APPLICATION_FORM_URLENCODED.equalsIgnoreCase(contentType)) {
+                List<NameValuePair> nameValuePairList = new ArrayList<NameValuePair>();
+                for (String key : params.keySet()) {
+                    nameValuePairList.add(new BasicNameValuePair(key, params.get(key).toString()));
+                }
+                UrlEncodedFormEntity formEntity = new UrlEncodedFormEntity(nameValuePairList, "utf-8");
+                formEntity.setContentType("application/x-www-form-urlencoded; charset=UTF-8");
+                post.setEntity(formEntity);
+            }
+
             HttpResponse httpResponse = client.execute(post);
             InputStream inStream = httpResponse.getEntity().getContent();
             BufferedReader reader = new BufferedReader(new InputStreamReader(inStream, "utf-8"));
@@ -106,6 +125,51 @@ public class SignHclcUtils {
         }
     }
 
+//    public String postFormUrlEncoded(String url, JSONObject params, Map<String, String> headInfo) {
+//        HttpClient httpClient = HttpClientBuilder.create().build();
+//        HttpPost post = new HttpPost(url);
+//        String result = "";
+//        try {
+//            if (Objects.nonNull(headInfo)) {
+//                for (Map.Entry<String, String> entry : headInfo.entrySet()) {
+//                    post.setHeader(entry.getKey(), entry.getValue());
+//                }
+//            }
+//            if (params != null) {
+//                List<NameValuePair> nameValuePairList = new ArrayList<NameValuePair>();
+//                for (String key : params.keySet()) {
+//                    nameValuePairList.add(new BasicNameValuePair(key, params.get(key).toString()));
+//                }
+//                UrlEncodedFormEntity formEntity = new UrlEncodedFormEntity(nameValuePairList, "utf-8");
+//                formEntity.setContentType("application/x-www-form-urlencoded; charset=UTF-8");
+//                post.setEntity(formEntity);
+//            }
+//
+//            HttpResponse httpResponse = httpClient.execute(post);
+//            InputStream inStream = httpResponse.getEntity().getContent();
+//            BufferedReader reader = new BufferedReader(new InputStreamReader(inStream, "utf-8"));
+//            StringBuilder strber = new StringBuilder();
+//            String line = null;
+//
+//            while ((line = reader.readLine()) != null) {
+//                strber.append(line + "\n");
+//            }
+//
+//            inStream.close();
+//            result = strber.toString();
+//            if (httpResponse.getStatusLine().getStatusCode() == 200) {
+//                System.out.println("请求服务器成功");
+//            } else {
+//                System.out.println("请求服务端失败");
+//            }
+//
+//            return result;
+//        } catch (Exception var12) {
+//            var12.printStackTrace();
+//            throw new RuntimeException(var12);
+//        }
+//    }
+
     public String getJSON(String url) {
         try {
             URL thisurl = new URL(url);
@@ -184,7 +248,7 @@ public class SignHclcUtils {
      * @param param 请求参数，请求参数应该是 name1=value1&name2=value2 的形式。
      * @return URL 所代表远程资源的响应结果
      */
-    public static String getStr(String url, String param) {
+    public static String getStr(String url, String param, Map<String, String> headInfo) {
         String result = "";
         BufferedReader in = null;
         try {
@@ -196,6 +260,13 @@ public class SignHclcUtils {
             connection.setRequestProperty("accept", "*/*");
             connection.setRequestProperty("connection", "Keep-Alive");
             connection.setRequestProperty("user-agent", "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1;SV1)");
+
+            if (Objects.nonNull(headInfo)) {
+                for (Map.Entry<String, String> entry : headInfo.entrySet()) {
+                    connection.setRequestProperty(entry.getKey(), entry.getValue());
+                }
+            }
+
             // 建立实际的连接
             connection.connect();
             // 获取所有响应头字段
@@ -236,7 +307,7 @@ public class SignHclcUtils {
         try {
             SignHclcUtils signHclcUtils = new SignHclcUtils();
             String param = "appId=" + appId + "&secret=" + secret + "&grantType=client_credentials";
-            String stringResult = signHclcUtils.getStr(faceApiUrl, param);
+            String stringResult = signHclcUtils.getStr(faceApiUrl, param, null);
             JSONObject json2 = JSONObject.parseObject(stringResult);
             if ("0".equalsIgnoreCase(json2.getString("code"))) {
                 JSONObject data = json2.getJSONObject("data");

core/src/main/resources/app/esignHclc/mapper/SignInfoHclcMapper.xml

@@ -27,6 +27,7 @@
         <result column="AUTH_AGENT_ACCOUNT_ID" property="authAgentAccountId" jdbcType="VARCHAR"/>
         <result column="ORG_ATTACHMENT_ID" property="orgAttachmentId" jdbcType="VARCHAR"/>
         <result column="AUTH_FLAG" property="authFlag" jdbcType="VARCHAR"/>
+        <result column="SEAL_ID" property="sealId" jdbcType="VARCHAR"/>
     </resultMap>
 
     <select id="queryUserInfo" resultMap="BaseResultMap" parameterType="com.hand.app.esignHclc.dto.SignUserInfoHclc">
@@ -34,19 +35,19 @@
         from SIGN_USER_INFO_HCLC
         <where>
             <if test="openId != null">
-                and OPEN_ID = #{openId,jdbcType=DECIMAL}
+                and open_id = #{openId,jdbcType=DECIMAL}
             </if>
             <if test="idNo != null">
-                and ID_NO = #{idNo,jdbcType=VARCHAR}
+                and id_no = #{idNo,jdbcType=VARCHAR}
             </if>
             <if test="name != null">
-                and name = #{NAME,jdbcType=VARCHAR}
+                and name = #{name,jdbcType=VARCHAR}
             </if>
             <if test="accountId != null">
-                and nvl(ACCOUNT_ID,'N') = #{accountId,jdbcType=VARCHAR}
+                and nvl(account_id,'N') = #{accountId,jdbcType=VARCHAR}
             </if>
             <if test="authFlag != null">
-                and nvl(AUTH_FLAG,'N') = #{authFlag,jdbcType=VARCHAR}
+                and nvl(auth_flag,'N') = #{authFlag,jdbcType=VARCHAR}
             </if>
         </where>
         order by account_id

core/src/main/resources/config.properties

@@ -122,6 +122,10 @@ tsign.face.api.appId=4438798562
 tsign.face.api.secret=4024c2b5e503a84da6d126fdc6f0da81
 #认证结果通知地址
 tsign.api.notifyUrl=http://101.133.225.167/core/api/public/listen/auth/result
+#签署结果通知地址
+tsign.api.listenSignUrl=http://101.133.225.167/core/api/public/listen/sign/flow
+#签署完成跳转地址
+tsign.api.signRedirectUrl=http://sign.hitachics.com/www/#/ElectronicContract
 #微信公众号apiKey
 wx.apiKey=handexinxi
 #微信公众号接口地址

core/src/main/resources/profiles/dev/config.properties

@@ -10,19 +10,19 @@ redis.useSentinel=false
 
 redis.ip=localhost
 redis.port=6379
-redis.db=10
-#redis.password=123456
+redis.db=7
 
-db.jndiName=java:comp/env/jdbc/hls_support
 
+db.jndiName=java:comp/env/jdbc/dr_app_dev
 
 # db.type property is used for activiti
-db.type=mysql
-#db.type=oracle
+#db.type=mysql
+db.type=oracle
+#db.type=mssql
 #db.type=hana
 
-mybatis.identity=JDBC
-#mybatis.identity=SEQUENCE
+#mybatis.identity=JDBC
+mybatis.identity=SEQUENCE
 
 # environment
 env.code=SIT
@@ -97,11 +97,10 @@ ureport.fileStoreDir=
 wx.token=fdbiabwehuiv
 
 #企业号
-qy.wx.token=YDQFbrP4wAdA5TTSBxSCKk
-qy.wx.encodingAESKey=RuGAoQ7DHt0GdV9OkCLqYbzNBhDbiuuUiUskeltdcYK
-qy.wx.corpId=ww77bcfe6939a185fe
-qy.wx.corpSecret=pj0kw409qsMX6DnWF6iUYwhCQOom5oE7B7sAgHazHX4
-
+qy.wx.token=cjndksabebubcjd
+qy.wx.encodingAESKey=z2W9lyOAR1XjY8mopEmiSqib0TlBZzCFiCLp6IdS2Iv
+qy.wx.corpId=ww4ca7a88ea2843535
+qy.wx.corpSecret=tE3QJtYf89IsdlF99wZyo_QKEbb7lRFsJuIiuk8YOJ8
 
 ## end
 
@@ -110,23 +109,33 @@ domain=http://localhost:8070/core/
 #set task size
 thread.taskSize = 5
 
-markImgPath = C:/Users/����/Desktop/test9.png
-
-#esign dev
-tsign.project.id=1111563517
-tsign.project.secret=95439b0863c241c63a861b87d1e647b7
-tsign.api.url=http://121.40.164.61:8080/tgmonitor/rest/app!getAPIInfo2
+#esignHclc
+tsign.project.id=1000029
+tsign.project.secret=2e66a86bbc6fa9000d4a5f272cbc70e1
+#e签宝地址
+tsign.api.url=http://139.196.17.22:8035
+#用户认证地址
+tsign.face.api.url=https://smlopenapi.esign.cn
+#用户认证用户
+tsign.face.api.appId=4438798562
+#用户认证密码
+tsign.face.api.secret=4024c2b5e503a84da6d126fdc6f0da81
+#认证结果通知地址
+tsign.api.notifyUrl=http://101.133.225.167/core/api/public/listen/auth/result
+#签署结果通知地址
+tsign.api.listenSignUrl=http://101.133.225.167/core/api/public/listen/sign/flow
+#签署完成跳转地址
+tsign.api.signRedirectUrl=http://sign.hitachics.com/www/#/ElectronicContract
+#微信公众号apiKey
+wx.apiKey=handexinxi
+#微信公众号接口地址
+wx.apiHttpUrl=https://wxgzh.hitachics.com/hcs-public-server/internal/third/
+#微信服务器图片保存中台路径
+wx.image.path = D:\\app_dev\\apache-tomcat-app\\app_file
 
-#esign
-#tsign.project.id=1111565057
-#tsign.project.secret=cf74f42ab268ae0b31ba2ee98e84bab5
-#tsign.api.url=http://openapi.tsign.cn:8080/tgmonitor/rest/app!getAPIInfo2
 
-#aliyun
-aliyun.accessKeyId=LTAI4BKXkUQW1jVY
-aliyun.accessKeySecret=TlaBwgHASAshVfPX6jMWgQahx9epse
 
 face.check.enable=false
 
 #金格电子合同配置文件地址
-electronic.signature.path=/Volumes/work/idea/APIconfig
+electronic.signature.path=/Volumes/work/idea/APIconfig
\ No newline at end of file

core/src/main/resources/profiles/sit/config.properties

@@ -10,19 +10,19 @@ redis.useSentinel=false
 
 redis.ip=localhost
 redis.port=6379
-redis.db=10
-#redis.password=123456
+redis.db=7
 
-db.jndiName=java:comp/env/jdbc/hls_support
 
+db.jndiName=java:comp/env/jdbc/dr_app_dev
 
 # db.type property is used for activiti
-db.type=mysql
-#db.type=oracle
+#db.type=mysql
+db.type=oracle
+#db.type=mssql
 #db.type=hana
 
-mybatis.identity=JDBC
-#mybatis.identity=SEQUENCE
+#mybatis.identity=JDBC
+mybatis.identity=SEQUENCE
 
 # environment
 env.code=SIT
@@ -97,11 +97,10 @@ ureport.fileStoreDir=
 wx.token=fdbiabwehuiv
 
 #企业号
-
-qy.wx.token=YDQFbrP4wAdA5TTSBxSCKk
-qy.wx.encodingAESKey=RuGAoQ7DHt0GdV9OkCLqYbzNBhDbiuuUiUskeltdcYK
-qy.wx.corpId=ww77bcfe6939a185fe
-qy.wx.corpSecret=pj0kw409qsMX6DnWF6iUYwhCQOom5oE7B7sAgHazHX4
+qy.wx.token=cjndksabebubcjd
+qy.wx.encodingAESKey=z2W9lyOAR1XjY8mopEmiSqib0TlBZzCFiCLp6IdS2Iv
+qy.wx.corpId=ww4ca7a88ea2843535
+qy.wx.corpSecret=tE3QJtYf89IsdlF99wZyo_QKEbb7lRFsJuIiuk8YOJ8
 
 ## end
 
@@ -110,23 +109,33 @@ domain=http://localhost:8070/core/
 #set task size
 thread.taskSize = 5
 
-markImgPath = C:/Users/����/Desktop/test9.png
-
-#esign dev
-tsign.project.id=1111563517
-tsign.project.secret=95439b0863c241c63a861b87d1e647b7
-tsign.api.url=http://121.40.164.61:8080/tgmonitor/rest/app!getAPIInfo2
+#esignHclc
+tsign.project.id=1000029
+tsign.project.secret=2e66a86bbc6fa9000d4a5f272cbc70e1
+#e签宝地址
+tsign.api.url=http://139.196.17.22:8035
+#用户认证地址
+tsign.face.api.url=https://smlopenapi.esign.cn
+#用户认证用户
+tsign.face.api.appId=4438798562
+#用户认证密码
+tsign.face.api.secret=4024c2b5e503a84da6d126fdc6f0da81
+#认证结果通知地址
+tsign.api.notifyUrl=http://101.133.225.167/core/api/public/listen/auth/result
+#签署结果通知地址
+tsign.api.listenSignUrl=http://101.133.225.167/core/api/public/listen/sign/flow
+#签署完成跳转地址
+tsign.api.signRedirectUrl=http://sign.hitachics.com/www/#/ElectronicContract
+#微信公众号apiKey
+wx.apiKey=handexinxi
+#微信公众号接口地址
+wx.apiHttpUrl=https://wxgzh.hitachics.com/hcs-public-server/internal/third/
+#微信服务器图片保存中台路径
+wx.image.path = D:\\app_dev\\apache-tomcat-app\\app_file
 
-#esign
-#tsign.project.id=1111565057
-#tsign.project.secret=cf74f42ab268ae0b31ba2ee98e84bab5
-#tsign.api.url=http://openapi.tsign.cn:8080/tgmonitor/rest/app!getAPIInfo2
 
-#aliyun
-aliyun.accessKeyId=LTAI4BKXkUQW1jVY
-aliyun.accessKeySecret=TlaBwgHASAshVfPX6jMWgQahx9epse
 
 face.check.enable=false
 
 #金格电子合同配置文件地址
-electronic.signature.path=/Volumes/work/idea/APIconfig
+electronic.signature.path=/Volumes/work/idea/APIconfig
\ No newline at end of file

core/src/main/resources/profiles/uat/config.properties

@@ -10,19 +10,19 @@ redis.useSentinel=false
 
 redis.ip=localhost
 redis.port=6379
-redis.db=10
-#redis.password=123456
+redis.db=7
 
-db.jndiName=java:comp/env/jdbc/hls_support
 
+db.jndiName=java:comp/env/jdbc/dr_app_dev
 
 # db.type property is used for activiti
-db.type=mysql
-#db.type=oracle
+#db.type=mysql
+db.type=oracle
+#db.type=mssql
 #db.type=hana
 
-mybatis.identity=JDBC
-#mybatis.identity=SEQUENCE
+#mybatis.identity=JDBC
+mybatis.identity=SEQUENCE
 
 # environment
 env.code=SIT
@@ -97,10 +97,10 @@ ureport.fileStoreDir=
 wx.token=fdbiabwehuiv
 
 #企业号
-qy.wx.token=YDQFbrP4wAdA5TTSBxSCKk
-qy.wx.encodingAESKey=RuGAoQ7DHt0GdV9OkCLqYbzNBhDbiuuUiUskeltdcYK
-qy.wx.corpId=ww77bcfe6939a185fe
-qy.wx.corpSecret=pj0kw409qsMX6DnWF6iUYwhCQOom5oE7B7sAgHazHX4
+qy.wx.token=cjndksabebubcjd
+qy.wx.encodingAESKey=z2W9lyOAR1XjY8mopEmiSqib0TlBZzCFiCLp6IdS2Iv
+qy.wx.corpId=ww4ca7a88ea2843535
+qy.wx.corpSecret=tE3QJtYf89IsdlF99wZyo_QKEbb7lRFsJuIiuk8YOJ8
 
 ## end
 
@@ -109,23 +109,33 @@ domain=http://localhost:8070/core/
 #set task size
 thread.taskSize = 5
 
-markImgPath = C:/Users/����/Desktop/test9.png
+#esignHclc
+tsign.project.id=1000029
+tsign.project.secret=2e66a86bbc6fa9000d4a5f272cbc70e1
+#e签宝地址
+tsign.api.url=http://139.196.17.22:8035
+#用户认证地址
+tsign.face.api.url=https://smlopenapi.esign.cn
+#用户认证用户
+tsign.face.api.appId=4438798562
+#用户认证密码
+tsign.face.api.secret=4024c2b5e503a84da6d126fdc6f0da81
+#认证结果通知地址
+tsign.api.notifyUrl=http://101.133.225.167/core/api/public/listen/auth/result
+#签署结果通知地址
+tsign.api.listenSignUrl=http://101.133.225.167/core/api/public/listen/sign/flow
+#签署完成跳转地址
+tsign.api.signRedirectUrl=http://sign.hitachics.com/www/#/ElectronicContract
+#微信公众号apiKey
+wx.apiKey=handexinxi
+#微信公众号接口地址
+wx.apiHttpUrl=https://wxgzh.hitachics.com/hcs-public-server/internal/third/
+#微信服务器图片保存中台路径
+wx.image.path = D:\\app_dev\\apache-tomcat-app\\app_file
 
-#esign dev
-tsign.project.id=1111563517
-tsign.project.secret=95439b0863c241c63a861b87d1e647b7
-tsign.api.url=http://121.40.164.61:8080/tgmonitor/rest/app!getAPIInfo2
 
-#esign
-#tsign.project.id=1111565057
-#tsign.project.secret=cf74f42ab268ae0b31ba2ee98e84bab5
-#tsign.api.url=http://openapi.tsign.cn:8080/tgmonitor/rest/app!getAPIInfo2
-
-#aliyun
-aliyun.accessKeyId=LTAI4BKXkUQW1jVY
-aliyun.accessKeySecret=TlaBwgHASAshVfPX6jMWgQahx9epse
 
 face.check.enable=false
 
 #金格电子合同配置文件地址
-electronic.signature.path=/Volumes/work/idea/APIconfig
+electronic.signature.path=/Volumes/work/idea/APIconfig
\ No newline at end of file