parent: ca7aa881 | 补丁 | 提交 | ignore whitespace
admin
2019-03-04 cdaacd7f7ba10c00696e14de498085af59caa402 
支付宝更改
5个文件已修改
27 ■■■■■ 已修改文件
fanli/src/main/java/com/yeshi/fanli/controller/client/SystemClientController.java 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/service/impl/config/SystemClientParamsServiceImpl.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/service/impl/msg/UserMoneyMsgNotificationServiceImpl.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/service/inter/config/SystemClientParamsService.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/resource/alipay.properties 4 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 
 fanli/src/main/java/com/yeshi/fanli/controller/client/SystemClientController.java


@@ -56,7 +56,7 @@


            return;



        }



        List<SystemClientParams> systemClientParamsList = systemClientParamsService



                .getSystemClientParamsBySystemId(system.getId());



                .getSystemClientParamsBySystemId(system.getId(),Integer.parseInt(acceptData.getVersion()));



        if (systemClientParamsList == null || systemClientParamsList.size() == 0) {



            out.print(JsonUtil.loadFalseResult("暂无数据"));



            return;



@@ -73,17 +73,17 @@






            }







            if (sp.getKey().equalsIgnoreCase("iosonling") && "ios".equalsIgnoreCase(acceptData.getPlatform())



            if (ssp.getKey().equalsIgnoreCase("iosonling") && "ios".equalsIgnoreCase(acceptData.getPlatform())



                    && configService.iosOnLining(Integer.parseInt(acceptData.getVersion()))) {



                sp.setValue("1");



            } else if (sp.getKey().equalsIgnoreCase("home_weex_url")) {



                ssp.setValue("1");



            } else if (ssp.getKey().equalsIgnoreCase("home_weex_url")) {



                if (("android".equalsIgnoreCase(acceptData.getPlatform())



                        && Integer.parseInt(acceptData.getVersion()) < 36)) {



                    // 老版本weex（1.5.1之前的）



                    sp.setValue("http://ec-1255749512.file.myqcloud.com/resource/weex/flq_index_v2.js");



                    ssp.setValue("http://ec-1255749512.file.myqcloud.com/resource/weex/flq_index_v2.js");



                } else if ("ios".equalsIgnoreCase(acceptData.getPlatform())



                        && Integer.parseInt(acceptData.getVersion()) < 44)



                    sp.setValue("http://ec-1255749512.file.myqcloud.com/resource/weex/flq_index_v2.js");



                    ssp.setValue("http://ec-1255749512.file.myqcloud.com/resource/weex/flq_index_v2.js");



            }



            list.add(ssp);



        }





 fanli/src/main/java/com/yeshi/fanli/service/impl/config/SystemClientParamsServiceImpl.java


@@ -53,6 +53,13 @@


        return systemClientParamsDao.list("from SystemClientParams scp where scp.system.id=?",



                new Serializable[] { id });



    }



	


    @Cacheable(value = "clientParamCache", key = "#id+'-'+#version")



    public List<SystemClientParams> getSystemClientParamsBySystemId(long id,int version) {







        return systemClientParamsDao.list("from SystemClientParams scp where scp.system.id=?",



                new Serializable[] { id });



    }







    public List<SystemClientParamsAdmin> getAdminList(System system, String key) {



        List<SystemClientParams> list;





 fanli/src/main/java/com/yeshi/fanli/service/impl/msg/UserMoneyMsgNotificationServiceImpl.java


@@ -58,7 +58,7 @@


    @Override



    public void alipayAccountValid(AlipayAccountValidNormalHistory history) {



        MsgMoneyDetail detail = MsgMoneyDetailFactory.createAlipayAccountValidMsg(history, history.getUid(),



                "重庆椰视网络有限公司", new BigDecimal("0.1"), null);



                "重庆小影记科技有限公司", new BigDecimal("0.1"), null);



        try {



            msgMoneyDetailService.addMsgMoneyDetail(detail);



        } catch (MsgMoneyDetailException e) {





 fanli/src/main/java/com/yeshi/fanli/service/inter/config/SystemClientParamsService.java


@@ -11,6 +11,8 @@


public interface SystemClientParamsService {



    



    public List<SystemClientParams> getSystemClientParamsBySystemId(long id);



	


    public List<SystemClientParams> getSystemClientParamsBySystemId(long id,int version);







    public List<SystemClientParamsAdmin> getAdminList(System system, String key);









 fanli/src/main/resource/alipay.properties


@@ -1,2 +1,2 @@


appId=2017022805949525



private_key=MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDAHoondfadyVIjqKsYfEdA0s8/mj4GFro6Oojc3pUd1RshUBN+Z9QoDMPH+zxNrm67V07/5YRuMehyLJ7C4eN/s4mguqwTEywhQIlFflDyu6inUDGjV89nvYzeAEIyhCg2qkWx+PVyeWNCCDrhwjeqleubZ3GgORk23J088uzBi+B29j9mSuVesydm938B/+7xCbJJ9rW8Rcm/LzfyTXQ/EfdTpurPtAJbQNtjmkB24ASUCB7hofkiNWXVcGwTC772pidw9JaMxpKkrGsK2SAs6P2lPwxt/ADziajtcY0sdhPijirY+QVqZFFLe6nS9Fl47oWRzajHPJM+JDpBQYN5AgMBAAECggEAbB/D+Tl2to7bX55JzNoE8AK1CUKxrZOU87iF1mie289YGYOLtRSSXofwl9hZtA5724vjtjliMvJ7s+ZQ47Vl6DUPPBpTRdkAeSZtG2NgA3yCCsgjZ56/587SPQ9AMlYWm81wtB09ZlPS/RLMsMoxshv2IdwyIs5/1lSLWgYOIU6yGepjo7tF6e9cD93cPYpbIczPmgUhsMitcIpsBG8v1K6YeaNIg+uaKg2g5g5nyIR305ZXCVB4U8TQyIwx3EBiLBe3spSFqjlw2FDXRJ+Npo23PcyX5QRYMTy85oSsBXqCvm6IHqxic0skiUOE+h5vewMnw0PsVM8WW+yWVInaAQKBgQDlqNJ2nS5MZ82cgX5OJ9f0YdBKPxDts/BkH10GteKTpJ+has/TCld5/kaiuWSBQJfIE2/AhyP63hIvpAnZaXqmEC5TKthWL1KlyxXsgp+KqkHpSbZPbsiXoWmKeH3mdqj4bC9FLPi1LyRdnYBMznihpSx8tlbp35VYMnzkZlY2UQKBgQDWJ3oPXxfsBahW9Sx7UOEYishYzxdzbR+iBws2i+94YgswZoYQ+X+/xB4K4uf/oQcvl5+KeIjrm6M/32kcQFSc/fE1kPUFYMNHCfBWWWzYkgmf7JFVPIbpy7Ei9aYXoktQpjJubDLx3kLsdV+SOi4xh2RmQxOUgZLi59/0pmsoqQKBgCkHK/I8ylSkBrt69tGHlLD3+HoLIj8U8lEwuTHFtKCjvFDeABq3skD9CClx7V6Z54O61TAT9H2Qxrb0Gz5X9a1NHrmE4fkjoyQzT8tc2puvJu9CV+uA4x0TnQM722IcuLsIuLkm+5eCwIBo7s7J5AscswHkoUpOwyNqgZ1cGvLBAoGBANBdJpjQKEFfm9PHxpjRL8ImPhqSnDmVYiLPAaz36G7Tzhkwl57qcs6NrcFf1uTUs14uA2/CKU48Z1EdOXLgcLMzLT62JIAwDrAOzoXlik8JgE3W6ezp8EaIBniCVDFImkkE+6qOod7NJ4ZUCUIIU6ujFR+ege2LSPR3MWMjjL3JAoGBANVd44Bj254eYwTEKxV/jq0Xnu4F3A3Q+1DJmoYgHAtkK+LDljof/WfoaaJAh1JBVgNg+YJpSHMs6SshSa0pO08UU9I0q6Epm99uIzkxcS6eQY1NsH1fdGuFp/7xQtvD0w06N7TyCfqL8lAb8wMiuHxiacDjtIn6cmqgKEylroro


appId=2018120462438303



private_key=MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCr3zyepJWxJxRFfzJ3LX0Sb/HLiLndOmdcufUzcHuQ2qR0vSFbQ8GUe9IMkSsjWCVFtOGO1rc8BRuZoxapP6g8TrhPpMjqkxGJ0kiRIJ5OM76Czqcd8xy4gtqHPXHybr76wlOTeHmfQkABTPsO8H/IgLkafa7Gs2fdDMswn+2zlkk6ghyU8HptyDnnjhW2CXBGZnqUHDv894eO6q8F7abaabEjzssQykC6y8IoYngziy0zYk89wr+ZfDH7j9zKNOLXWfiN1xz8+Bjdu8gybAqKZjsujP9pzUuUTgU+zuvBi/wL12HQVqQHq/7wrXNUBJt3fcwquL4JokaKD6jy2O5dAgMBAAECggEAVxP/bpEMlniqOJu9Qcx2NcUpyGk5YfCZNc2xgaJXuIhOEidQoyCtD0G8pklWhc2+9JY0QV5f77TWyvxqGs35urRXhWKDuPVSSXWU9pKEIjLtLvDskqv9vS3u8d4bwSyC7iFOnsTHOf0i2IXcHTGUTE2LevR6fImg8cntmHEuyXFh4CmhoK1j0eBL5oXyQJJ+IXjp6ihwHbhX9h5IKXct5esmcL5hC77x3nyhIEA7sT/UfQH6vMsOHj0Ie8oju56ePQi7fQfGkOVdXQWCmusrPoqinmsgRPBB6N0uvGy33nscPjc00T0wNDiTOuRR5vS0H8N5WNorUzeMH1hsyE52sQKBgQDjf30UspjBO66vmJM7mjBl+5IAJcXXQotJGbOX1yr0YsUo4QbR+2QG8xJDtR0XnXgbhHZ97sPGcDKc7Wb8hI6hkl5fjQVQ3SKcyOIYSkFUcLPNlK8KjWvCgbGesfWAWopzkpEmvy+BtCOG+iQXtzKAOa9YCPn3uvzanBtgdKKhewKBgQDBZ6nyjl+1AdW1zTE/Rjc8CXUQqHuhV6PN1+KCuPVHcf2v3BwPFjODSncpK/11q0u9LRkXmgPatmqPSC3/xtGSAqeWHxwX3ILwur7cCP9VhzmW4yDrZIDQ0/OmKPa+7B4pghlGIo/S13WJi7YhhCjldBZc9/32tvxFa1gUToJMBwKBgQCYwRDWpfklvpJT+6nY2nZm892b1cEbAeaOhgBuEx8Xi36BLV+r/RW0COCZr/HB2o08RNxfQMQZ6VpCvrFpGwS+fo55sDICkwlbpxMRZkKplSdWAeDqv/y8VONUAIAs2B6g7agjETqv56n3RtyXQ/5X1OPkw9o8OkTv8OP9BzPwIwKBgHkoFoeTdxMuPhGwpDwuIWXjyskPsrsE6uGFbylS8py6JSDos08kKksB+Bn7q8Dt+Pleagyl9+ooQiLWJbLIevqL3S4m+PNduU1Sv0OaA1Ix7vq9+B5eDHBFhqm9ma1Kvy5jiK+t8Qk03jW3JvZiEziCe4vr8tV+FhTqxPebovY7AoGBAMD2Q5nxLO1ai68zdL0iWdtT8W7ETQm8jd5RsB+fulMMulQOiowIe7L100XT/Ni+z4XFhQrhr9JHkTLu6+pMdwJtJKZENWz0nec7QhhplcxL332XtA78ZzIjaikMn/WggDeCSLJL/qQEQL5YBdDpQg1wWyW3j3hPAjx7ebhb374A