崔深圳服务器版本

README.md

@@ -0,0 +1,20 @@
+# HSDataPortal
+
+#### 介绍
+
+衡水大数据开放与共享平台代码  HSDataPortal
+
+config.properties  line:58
+
+资源开放平台    
+ userType=user   
+ redirectHomeUrl=/open/    
+ redirectLoginUrl=/open/account/login.htm    
+
+资源共享平台   
+userType=admin      
+redirectHomeUrl=/share/     
+redirectLoginUrl=/open/account/login.htm     
+
+
+

pom.xml

@@ -9,7 +9,7 @@
   <url>http://maven.apache.org</url>
   <properties>
     <spring.version>4.2.6.RELEASE</spring.version>
-    <mysql.version>5.1.21</mysql.version>
+    <mysql.version>8.0.11</mysql.version>
     <mybatis.version>3.4.2</mybatis.version>
     <shiro.version>1.3.2</shiro.version>
     <druid.version>1.0.29</druid.version>

src/main/java/com/lightinit/hsdataportal/WXsdk/MyPayConfig.java

@@ -11,6 +11,12 @@ public class MyPayConfig extends WXPayConfig {
     private byte[] certData;
 
     public MyPayConfig() throws Exception {
+       // String certPath = "/path/to/apiclient_cert.p12";
+        //File file = new File(certPath);
+//        InputStream certStream = new FileInputStream(file);
+//        this.certData = new byte[(int) file.length()];
+//        certStream.read(this.certData);
+//        certStream.close();
     }
 
     public String getAppID() {

src/main/java/com/lightinit/hsdataportal/WXsdk/WXPayUtil.java

@@ -244,8 +244,7 @@ public class WXPayUtil {
         for (byte item : array) {
             sb.append(Integer.toHexString((item & 0xFF) | 0x100).substring(1, 3));
         }
-        String s = sb.toString().toUpperCase();
-        return s;
+        return sb.toString().toUpperCase();
     }
 
     /**
@@ -264,8 +263,7 @@ public class WXPayUtil {
         for (byte item : array) {
             sb.append(Integer.toHexString((item & 0xFF) | 0x100).substring(1, 3));
         }
-        String s = sb.toString().toUpperCase();
-        return s;
+        return sb.toString().toUpperCase();
     }
 
     /**

src/main/java/com/lightinit/hsdataportal/common/HttpTookitUtils.java

@@ -100,50 +100,6 @@ public class HttpTookitUtils {
         }
         return responseContent;
     }
-    public static String doGet(String url, CharEncoding charset,String appId,String userId,String version,String timestamp,String summary) {
-        String responseContent="";
-        CloseableHttpClient httpclient = HttpClients.createDefault();
-        try {
-            HttpGet httpget = new HttpGet(url);
-            if(StringUtils.isEmpty(appId)==false) {
-                httpget.addHeader("appId",appId);
-            }
-            if(StringUtils.isEmpty(userId)==false) {
-                httpget.addHeader("userId",userId);
-            }
-            if(StringUtils.isEmpty(version)==false) {
-                httpget.addHeader("version",version);
-            }
-            if(StringUtils.isEmpty(timestamp)==false) {
-                httpget.addHeader("timestamp",timestamp);
-            }
-            if(StringUtils.isEmpty(summary)==false) {
-                httpget.addHeader("summary",summary);
-            }
-            CloseableHttpResponse response = httpclient.execute(httpget);
-            try {
-                HttpEntity entity = response.getEntity();
-                if (entity != null) {
-                    responseContent= EntityUtils.toString(entity, charset.value());
-                }
-            } finally {
-                response.close();
-            }
-        } catch (ClientProtocolException e) {
-            e.printStackTrace();
-        } catch (ParseException e) {
-            e.printStackTrace();
-        } catch (IOException e) {
-            e.printStackTrace();
-        } finally {
-            try {
-                httpclient.close();
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-        }
-        return responseContent;
-    }
     public static String doGet(String url, List<NameValuePair> params, CharEncoding charset) {
         return doGet(url,params,charset,"");
     }

src/main/java/com/lightinit/hsdataportal/controller/WXPayController.java

@@ -28,7 +28,6 @@ import java.io.BufferedReader;
 import java.io.ByteArrayOutputStream;
 import java.io.InputStream;
 import java.io.InputStreamReader;
-import java.math.BigDecimal;
 import java.util.Base64;
 import java.util.HashMap;
 import java.util.Map;
@@ -109,7 +108,6 @@ public class WXPayController {
     @ResponseBody
     public String updateOrderState(HttpServletRequest request,
                                    HttpServletResponse response) throws Exception {
-        String resXml = "";
         logger.info("-------------------门户网站支付异步回调开始---------------------");
         //取出通知参数
         InputStream inputStream;
@@ -122,43 +120,29 @@ public class WXPayController {
         }
         in.close();
         inputStream.close();
-        logger.info("-----------xml返回："+sb.toString()+"---------------");
         Map<String, String> result = WXPayUtil.xmlToMap(sb.toString()) ;
-        logger.info("-----------获得map打印："+result+"---------------");
-        if (result.get("result_code").toString().equalsIgnoreCase("SUCCESS")) {
-            String orderNumber = result.get("out_trade_no");
-            logger.info("-----------订单号："+orderNumber+"---------------");
-            String sign = result.get("sign") ;
-            logger.info("-----------签名："+sign+"---------------");
-            String totalFee = result.get("total_fee") ;
-            logger.info("-----------订单金额："+totalFee+"---------------");
-            Order order=wxPayService.queryUserOrderByOrderNumber(orderNumber);
-            //验证签名
-            Boolean falg = WXPayUtil.isSignatureValid(result, DicWXPayInfo.KEY,WXPayConstants.SignType.HMACSHA256);
-            logger.info("falg={}", falg);
-            String title = order.getOrderAmount().multiply(BigDecimal.valueOf(100)).intValue() + "";
-            logger.info("-----------title："+title+"---------------");
-            if (falg) {
-                logger.info("-----------签名验证通过！---------------");
-                if (title.equals(totalFee)){
-                    resXml = "SUCCESS";
-                    logger.info("-----------金额验证成功！---------------");
-                    logger.info("-----------进入修改订单状态！---------------");
-                    //修改数据库付款状态
-                    ResultState<String> resultState = alipayService.updateUserOderByOrderNumber(order.getId(),order.getOrderNumber());
-                    if(resultState.getStateCode()!=200){
-                        logger.error(resultState.getMsg());
-                    }
-                    logger.info("-----------成功修改订单状态！---------------");
-                }
-            }else {
-                logger.info("-----------修改订单状态时，签名验证未通过！---------------");
-                resXml = "FAIL";
+        String orderNumber = result.get("out_trade_no");
+        String sign = result.get("out_trade_no") ;
+        Order order=wxPayService.queryUserOrderByOrderNumber(orderNumber);
+        //验证签名
+        Map<String, String> payParams = MyWXUtils.getPrepayid(orderNumber, order, MyWXUtils.getRemoteHost(request));
+        payParams.put("sign",sign) ;
+        Boolean falg = WXPayUtil.isSignatureValid(payParams, DicWXPayInfo.KEY, WXPayConstants.SignType.MD5);
+        logger.info("falg={}", falg);
+        if (falg) {
+            logger.info("-----------成功修改订单状态！---------------");
+            //修改数据库付款状态
+            ResultState<String> resultState = alipayService.updateUserOderByOrderNumber(order.getId(),order.getOrderNumber());
+            if(resultState.getStateCode()!=200){
+                logger.error(resultState.getMsg());
+                return DicPayResult.UPDATE_FAIL;
             }
+            logger.info("-----------成功修改订单状态！---------------");
+            return DicPayResult.UPDATE_SUCCESS;
         }else {
-            resXml = "FAIL";
+            logger.info("-----------修改订单状态时，签名验证未通过！---------------");
+            return DicPayResult.UPDATE_FAIL;
         }
-        return resXml ;
     }
 
     /**

src/main/java/com/lightinit/hsdataportal/controller/open/MicroappOpenController.java

@@ -9,13 +9,11 @@ import com.lightinit.hsdataportal.model.*;
 import com.lightinit.hsdataportal.service.IMicroappService;
 import com.lightinit.hsdataportal.service.IMyDataService;
 import com.lightinit.hsdataportal.service.IResourceCatelogService;
-import com.sun.deploy.net.HttpUtils;
 import org.apache.http.NameValuePair;
 import org.apache.http.message.BasicNameValuePair;
 import org.apache.shiro.authz.annotation.RequiresAuthentication;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.stereotype.Controller;
 import org.springframework.validation.BindingResult;
@@ -32,13 +30,12 @@ import javax.servlet.http.HttpSession;
 import javax.validation.Valid;
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
-import java.util.*;
-
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
 @RequestMapping(value = "/open/microapp")
 @Controller
 public class MicroappOpenController extends BaseController {
-    @Value("${applicationId}")
-    private String appId;
     @Autowired
     private IMicroappService microappService;
     @Autowired
@@ -46,6 +43,7 @@ public class MicroappOpenController extends BaseController {
     @Autowired
     private IMyDataService myDataService;
     @RequestMapping(value = "openList.action")
+    @ResponseBody
     public ModelAndView openList(MicroappSearchModel inputModel, @RequestParam(defaultValue = "1") int pageNo) {
         ModelAndView modelAndView = new ModelAndView("/open/microapp/index");
         BaseExample.Page pager = new BaseExample.Page();
@@ -118,28 +116,26 @@ public class MicroappOpenController extends BaseController {
      * @param id
      * @return
      */
+//    @RequestMapping(value = "openDemo.action/{id}")
     @RequestMapping(value = "openDemo.action/{id}/{flag}", produces = "text/html; charset=UTF-8")
     @RequiresAuthentication
     @ResponseBody
-    public String openDemo(@PathVariable long id,@PathVariable int flag,HttpSession session) throws Exception {
-        LoginUser loginUser =(LoginUser) session.getAttribute(LoginUser.SESSION_KEY_LOGIN_USER);
+    public String openDemo(@PathVariable long id,@PathVariable int flag) {
         ResourceMicroappWithBLOBs outputModel=microappService.demo(id);
-        ApiEncryptUtil apiEncryptUtil = new ApiEncryptUtil();
-        long userId = loginUser.getId();
-        String publicKey =  microappService.getPublicKey(userId);
-        String username = loginUser.getUsername();
-        Long date = new Date().getTime();
-        String version = "1.0";
-        String timestamp = date.toString();
-        String summary = apiEncryptUtil.encrypt(appId+username+timestamp,apiEncryptUtil.getPublicKey(publicKey));
         String html ="";
         if(flag==1) {
-             html = HttpTookitUtils.doGet(outputModel.getUrl(),CharEncoding.UTF8,appId,username,version,timestamp,summary);
-//             html = HttpTookitUtils.doGet(outputModel.getUrl(),null,  CharEncoding.UTF8);
+             html = HttpTookitUtils.doGet(outputModel.getUrl(),null,  CharEncoding.UTF8);
         }else {
-            html = HttpTookitUtils.doGet(outputModel.getDemoUrl(),CharEncoding.UTF8,appId,username,version,timestamp,summary);
-
+             html = HttpTookitUtils.doGet(outputModel.getDemoUrl(),null,  CharEncoding.UTF8);
         }
+
+//        String html = HttpTookitUtils.doGet("http://127.0.0.1:8080/hsdatashowapi/app/cockpit/jmxfzs.htm",null,  CharEncoding.UTF8);
+//        String str="";
+//        try {
+//             str = new String(html.getBytes("utf-8"),"iso8859-1");
+//        } catch (UnsupportedEncodingException e) {
+//            e.printStackTrace();
+//        }
         return html;
     }
 

src/main/java/com/lightinit/hsdataportal/impl/AlipayServiceImpl.java

@@ -66,7 +66,6 @@ public class AlipayServiceImpl implements IAlipayService {
                     userAccountMapper.insert(userAccount);
                 }
                 userAccount.setBalance(userAccount1.getBalance().add(order1.getOrderAmount()));
-                userAccount.setId(order1.getUserId());
                 userAccountMapper.updateByPrimaryKeySelective(userAccount);
             }
             resultState.setData(orderNumber);

src/main/java/com/lightinit/hsdataportal/impl/MicroappServiceImpl.java

@@ -33,8 +33,6 @@ public class MicroappServiceImpl implements IMicroappService {
     private OrderGoodsMapper orderGoodsMapper;
     @Autowired
     private ResourceViewTimesMapper resourceViewTimesMapper;
-    @Autowired
-    private UserAuthSettingMapper userAuthSettingMapper;
     /**
      * 开放列表
      * @param inputModel
@@ -295,11 +293,6 @@ public class MicroappServiceImpl implements IMicroappService {
         return list;
     }
 
-    @Override
-    public String getPublicKey(Long id) {
-        DynamicDataContextHolder.setCustomerType(DynamicDataContextHolder.DEFAULT);
-        return userAuthSettingMapper.getPublicKey(id);
-    }
 
 
 //    @Override

src/main/java/com/lightinit/hsdataportal/mapper/UserAuthSettingMapper.java

@@ -27,6 +27,4 @@ public interface UserAuthSettingMapper {
     int updateByPrimaryKeySelective(UserAuthSetting record);
 
     int updateByPrimaryKey(UserAuthSetting record);
-
-    String getPublicKey(Long id);
 }

src/main/java/com/lightinit/hsdataportal/service/IMicroappService.java

@@ -30,8 +30,6 @@ public interface IMicroappService {
 
     List<ResourceAuth> isAPPly(Long id, Long publishSettingId);
 
-    String getPublicKey(Long id);
-
 //    PublishSetting selectSettingById(Long publishSettingId);
 //
 //    ResultState add(Order order);

src/main/resources/config.properties

@@ -2,13 +2,17 @@
 #jdbc.sentry.url=jdbc:mysql://127.0.0.1:3306/hslocalhost?useUnicode=true&characterEncoding=utf8&autoReconnect=true&useSSL=false
 #jdbc.sentry.username=root
 #jdbc.sentry.password=root
+#jdbc.sentry.url=jdbc:mysql://115.29.47.155:3306/hsdataplatform?useUnicode=true&characterEncoding=utf8&autoReconnect=true&useSSL=false
+#jdbc.sentry.username=hsdataplatform
+#jdbc.sentry.password=lightinit1
+#jdbc.sentry.url=jdbc:mysql://47.94.133.127:3306/hsdataplatform?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai&autoReconnect=true&useSSL=false
+#jdbc.sentry.username=root
+#jdbc.sentry.password=iuGoto8#@20w
+
 jdbc.sentry.url=jdbc:mysql://rm-2zea3p7q7lrvjs8s4.mysql.rds.aliyuncs.com/hsdataplatform?useUnicode=true&characterEncoding=utf8&autoReconnect=true&useSSL=false
 jdbc.sentry.username=hsdataplatform
 jdbc.sentry.password=Lightinit@1
-#jdbc.sentry.url=jdbc:mysql://39.105.217.215:3306/hsdataplatform?useUnicode=true&characterEncoding=utf8&autoReconnect=true&useSSL=false
-#jdbc.sentry.username=hsdataplatform
-#jdbc.sentry.password=Lightinit@1
-jdbc.sentry.driverClassName=com.mysql.jdbc.Driver
+jdbc.sentry.driverClassName=com.mysql.cj.jdbc.Driver
 jdbc.sentry.maxWait=60000
 jdbc.sentry.maxActive=20
 jdbc.sentry.initialSize=1
@@ -60,9 +64,9 @@ redis.server=192.168.107.112
 #redirectLoginUrl=/open/account/login.htm
 userType=admin
 redirectHomeUrl=/share/
-redirectLoginUrl=/share/account/login.htm
+redirectLoginUrl=/open/account/login.htm
 imageContextPath=http://localhost:8080/hsdataimages/
-#\u521B\u4E1A\u5DE5\u5382 \u70B9\u51FB\u8FDB\u5165
+##\u521B\u4E1A\u5DE5\u5382 \u70B9\u51FB\u8FDB\u5165
 devops=http://121.17.30.198:8097/devops-web/
 #\u521B\u4E1A\u5DE5\u5382 \u670D\u52A1\u5F00\u53D1\u73AF\u5883
 devopsService=http://39.105.210.5:5151/devops-web/
@@ -76,7 +80,7 @@ devopsAnalysis=http://citysdk.dgtis.com:8088/login/
 #\u77ED\u4FE1\u914D\u7F6E
 regionId=cn-hangzhou
 accessKeyId=LTAIu3VL1kYEvDhb
-secret=ghLvcCUmWovWG3Jysxn86WVi5NYAJzhsdataportal
+secret=ghLvcCUmWovWG3Jysxn86WVi5NYAJz
 
 #\u5FAE\u4FE1\u652F\u4ED8
 #appId=wxe6aeac33838845d8

src/main/resources/log4j.properties

@@ -1,5 +1,6 @@
 #mybatis log4j config
-log4j.rootLogger=debug,stdout,D,E
+#log4j.rootLogger=debug,stdout,D,E
+log4j.rootLogger=info,E
 
 ### \u8F93\u51FA\u4FE1\u606F\u5230\u63A7\u5236\u62AC ###
 log4j.appender.stdout=org.apache.log4j.ConsoleAppender
@@ -27,7 +28,8 @@ log4j.appender.D.layout.ConversionPattern = %-d{yyyy-MM-dd HH:mm:ss}  [ %t:%r ]
 log4j.appender.E=org.apache.log4j.DailyRollingFileAppender
 log4j.appender.E.DatePattern='-'yyyy-MM-dd
 log4j.appender.E.Encoding=UTF-8
-log4j.appender.E.File=D://logs/hsdataportal/error.log
+#log4j.appender.E.File=D://logs/hsdataportal/error.log
+log4j.appender.E.File=/home/log/hsdataportal-share/error.log
 log4j.appender.E.Append=true
 log4j.appender.E.Threshold=ERROR
 log4j.appender.E.layout=org.apache.log4j.PatternLayout

src/main/resources/sqlmaps/OrderMapper.xml

@@ -467,7 +467,7 @@
   </select>
 
   <select id="selectBusinessType" resultType="com.lightinit.hsdataportal.entity.Order">
-    SELECT o.`order_amount`,o.`business_type`,o.user_id
+    SELECT o.`order_amount`,o.`business_type`
     FROM orders o WHERE o.`order_number` =#{orderNumber}
   </select>
 </mapper>

src/main/resources/sqlmaps/ResourceApiMapper.xml

@@ -411,9 +411,6 @@
       </if>
     </where>
 
-    <if test="sortType == null">
-      ORDER BY rs.sort_value DESC
-    </if>
     <if test="sortType !=null and sortType==0">
       ORDER BY rs.sort_value DESC
     </if>

src/main/resources/sqlmaps/UserAuthSettingMapper.xml

@@ -271,7 +271,4 @@
       deleted_by = #{deletedBy,jdbcType=BIGINT}
     where id = #{id,jdbcType=BIGINT}
   </update>
-  <select id="getPublicKey" parameterType="java.lang.Long" resultType="java.lang.String">
-      SELECT u.`auth_secret` FROM `user_auth_setting` u  WHERE u.`user_id`=#{id}
-  </select>
 </mapper>

src/main/webapp/pages/open/api/view.jsp

@@ -112,9 +112,9 @@
                         <div class="js01">${apiOpenViewModel.resourceName}</div>
                         <c:if test="${not empty apiOpenViewModel.interfaceViewModels}">
                             <c:forEach items="${apiOpenViewModel.interfaceViewModels}" var="interfaceView">
-                                <div class="js00" clearfix>
-                                    <span class="jk" style="float: left;">接口地址:</span>
-                                    <span class="jk0" style="word-break:  break-all;width:  810px;line-height:  normal;float:  left;padding-top:  10px;padding-left:  10px;padding-bottom:  10px;">${interfaceView.url}</span>
+                                <div class="js00">
+                                    <span class="jk">接口地址:</span>
+                                    <span class="jk0">${interfaceView.url}</span>
                                 </div>
                                 <div class="js00">
                                     <span class="jk">支持格式:</span>

src/main/webapp/pages/open/common/body_header_search.jsp

@@ -42,7 +42,7 @@
     <div class="window" >
         <div class="top00">
             <span class="p">高级搜索</span>
-            <img src="<%=resourcePath%>/images/icon_guanbi.png" alt="关闭" class="guanbi" onclick="closeGj()" >
+            <img src="../../../resource/images/icon_guanbi.png" alt="关闭" class="guanbi" onclick="closeGj()" >
         </div>
         <div class="form" style="padding-top:12px">
             <form id="gjFrom">

src/main/webapp/pages/open/microapp/index.jsp

@@ -51,7 +51,7 @@
                                 <c:if test="${themes.size()>0}">
                                     <c:forEach items="${themes}" var="theme">
                                         <li class="li">
-                                            <a href="##" onclick="themeSearch('${theme.catelogCode}')" class="a<c:if test="${searchModel.catelogThemeCode eq theme.catelogCode}">0</c:if>4"
+                                            <a href="" onclick="themeSearch('${theme.catelogCode}')" class="a<c:if test="${searchModel.catelogThemeCode eq theme.catelogCode}">0</c:if>4"
                                             >${theme.cateLogName}</a>
                                         </li>
                                     </c:forEach>
@@ -64,12 +64,12 @@
                             <div class="zhuti">部门：</div>
                             <ul class="item1">
                                 <li class="li">
-                                    <a href="##" onclick="sectorSearch('')" class="a<c:if test="${empty searchModel.sectorCode}">0</c:if>4">不限</a>
+                                    <a href="" onclick="sectorSearch('')" class="a<c:if test="${empty searchModel.sectorCode}">0</c:if>4">不限</a>
                                 </li>
                                 <c:if test="${sectors.size()>0}">
                                     <c:forEach items="${sectors}" var="sector">
                                         <li class="li">
-                                            <a href="##" onclick="sectorSearch('${sector.sectorCode}')" class="a<c:if test="${searchModel.sectorCode==sector.sectorCode}">0</c:if>4"
+                                            <a href="" onclick="sectorSearch('${sector.sectorCode}')" class="a<c:if test="${searchModel.sectorCode==sector.sectorCode}">0</c:if>4"
                                             >${sector.sectorName}</a>
                                         </li>
                                     </c:forEach>
@@ -82,7 +82,7 @@
                             <div class="zhuti">类型：</div>
                             <ul class="item1">
                                 <li class="li">
-                                    <a href="##" onclick="chargeMethodSearch('')" class="a<c:if test="${empty searchModel.chargeMethod}">0</c:if>4">不限</a>
+                                    <a href="" onclick="chargeMethodSearch('')" class="a<c:if test="${empty searchModel.chargeMethod}">0</c:if>4">不限</a>
                                 </li>
                                 <c:if test="${chargeMethods.size()>0}">
                                     <c:forEach items="${chargeMethods}" var="chargeMethod">
@@ -135,8 +135,8 @@
                         <jsp:param name="pageSize" value="${pager.pageSize}"/>
                         <jsp:param name="total" value="${pager.total}"/>
                     </jsp:include>
-                    <input type="hidden" name="theme" id="theme" value="${searchModel.catelogThemeCode}">
-                    <input type="hidden" name="sector" id="sector" value="${searchModel.sectorCode}">
+                    <input type="hidden" name="theme" id="theme" value="${searchModel.catelogTheme}">
+                    <input type="hidden" name="sector" id="sector" value="${searchModel.catelogSector}">
                     <input type="hidden" name="chargeMethod" id="chargeMethod" value="${searchModel.chargeMethod}">
 
                 </div>
@@ -160,7 +160,7 @@
         if ($("#chargeMethod").val() != null && $("#chargeMethod").val() != '' && $("#chargeMethod").val() != undefined) {
             str3 = "&chargeMethod=" + $("#chargeMethod").val();
         }
-        window.location.href = "<%=basePath%>/open/microapp/openList.action?" + str2 +str3+str1;
+        window.location.href = "<%=basePath%>/open/microapp/openList.action?" + str2 + str1+str3 ;
     }
 
     function sectorSearch(code) {
@@ -173,7 +173,7 @@
         if ($("#chargeMethod").val() != null && $("#chargeMethod").val() != '' && $("#chargeMethod").val() != undefined) {
             str3 = "&chargeMethod=" + $("#chargeMethod").val();
         }
-        window.location.href = "<%=basePath%>/open/microapp/openList.action?" + str2 +str3+str1;
+        window.location.href = "<%=basePath%>/open/microapp/openList.action?" + str2 + str1 + str3 ;
     }
 
     function chargeMethodSearch(str) {

src/main/webapp/pages/open/myAccount/index.jsp

@@ -23,7 +23,7 @@
             <div class="if">
                 <span id="tagchongzhi" class="xx0 xx01" onclick="chongZhiShow()"><a>充值记录</a></span>
                 <span id="tagjiaoyi" class="xx" onclick="jiaoYiShow()"><a>交易记录</a></span>
-                <%--<span class="xx"><a>支付密码记录</a></span>--%>
+                <span class="xx"><a>支付密码记录</a></span>
 
             </div>
             <div>

src/main/webapp/pages/open/myAccount/pay.jsp

@@ -80,7 +80,6 @@
 </div>
 </body>
 <script>
-    var interval = ''
     wxHiden() ;
     function wxShow() {
         $("#wxzf").show() ;
@@ -105,7 +104,7 @@
                         wxShow();
                         $("#wxzf").find("img").attr("src", "data:image/png;base64," + ret.qrcode);
                         //定时任务
-                        interval = setInterval(function () {
+                        var interval = setInterval(function () {
                             $.ajax({
                                 type: "POST",
                                 url: "<%=basePath%>/wxpay/selectFalgType.action/" + orderNumber,
@@ -117,7 +116,7 @@
                                     }
                                 }
                             });
-                        }, 1000);
+                        }, 100);
                         //定时任务完毕
                     }
                 }
@@ -129,7 +128,6 @@
     function closeWx() {
         $("#wxzf").find("img").attr("src", "");
         wxHiden() ;
-        clearInterval(interval);
     }
 
 </script>

src/main/webapp/pages/open/order/index.jsp

@@ -86,7 +86,7 @@
                         <td class="td3">合同金额</td>
                         <td class="td3">已收款金额</td>
                         <td class="td3">状态</td>
-                        <%--<td class="td3">操作</td>--%>
+                        <td class="td3">操作</td>
                     </tr>
                     <tr>
                         <td>132523123123</td>
@@ -96,7 +96,7 @@
                         <td>10万</td>
                         <td>10万</td>
                         <td>已生效</td>
-                        <%--<td><a class="qxbm">详情</a></td>--%>
+                        <td><a class="qxbm">详情</a></td>
                     </tr>
                 </table>
             </div>

src/main/webapp/pages/open/pay/userPay.jsp

@@ -108,7 +108,6 @@
 </div>
 </body>
 <script>
-    var interval = ''
     wxHiden() ;
     function wxShow() {
         $("#wxzf").show() ;
@@ -133,7 +132,7 @@
                     wxShow();
                     $("#wxzf").find("img").attr("src", "data:image/png;base64," + ret.qrcode);
                     //定时任务
-                    interval = setInterval(function () {
+                    var interval = setInterval(function () {
                         $.ajax({
                             type: "POST",
                             url: "<%=basePath%>/wxpay/selectFalgType.action/" + orderNumber,
@@ -145,7 +144,7 @@
                                 }
                             }
                         });
-                    }, 1000);
+                    }, 100);
                     //定时任务完毕
                 }
             }
@@ -170,7 +169,6 @@
     function closeWx() {
         $("#wxzf").find("img").attr("src", "");
         wxHiden() ;
-        clearInterval(interval);
     }
 
 </script>

src/main/webapp/pages/open/requirement_microapp/publish.jsp

@@ -56,14 +56,14 @@
                 <div class="fabu-01">
                     <span class="fabufont1"><span class="xinghao">*</span>联系人</span>
                     <span class="ff1">
-                    <input type="text" class="fabuinput"name="contact" placeholder="请输入联系人">
+                    <input type="text" class="fabuinput"name="contact" placeholder="张亮亮">
                     <div class="tishi4"></div>
                     </span>
                 </div>
                 <div class="fabu-01">
                     <span class="fabufont1"><span class="xinghao">*</span>联系电话</span>
                     <span class="ff1">
-                    <input type="text" class="fabuinput" name="phone" placeholder="请输入联系电话">
+                    <input type="text" class="fabuinput" name="phone" placeholder="13728283838">
                     <div class="tishi4"></div>
                     </span>
                 </div>

src/main/webapp/pages/share/api/view.jsp

@@ -109,8 +109,8 @@
                         <c:if test="${not empty apiOpenViewModel.interfaceViewModels}">
                         <c:forEach items="${apiOpenViewModel.interfaceViewModels}" var="interfaceView">
                             <div class="js00">
-                                <span class="jk" style="float: left;">接口地址:</span>
-                                <span class="jk0" style="word-break:  break-all;width:  810px;line-height:  normal;float:  left;padding-top:  10px;padding-left:  10px;padding-bottom:  10px;">${interfaceView.url}</span>
+                                <span class="jk">接口地址:</span>
+                                <span class="jk0">${interfaceView.url}</span>
                             </div>
                             <div class="js00">
                                 <span class="jk">支持格式:</span>

src/main/webapp/resource/css/open/base.css

@@ -4037,6 +4037,7 @@ p{
 
 .js00{
     width: 880px;
+    height: 36px;
     border-bottom: 1px dashed #c0c3cc;
 
 }