Merge remote-tracking branch 'origin/dev' into dev

ace-common/src/main/java/com/github/wxiaoqi/security/common/util/process/ResultCode.java

@@ -45,8 +45,6 @@ public class ResultCode {
 
 	public static int ORDER_NOT_EXIST = Integer.valueOf(SystemProperty.getResultConfig("ORDER_NOT_EXIST"));
 
-	public static int ORDER_STATUS_ERROR = Integer.valueOf(SystemProperty.getResultConfig("ORDER_STATUS_ERROR"));
-
 	public static int ORDER_GOODS_EXIST = Integer.valueOf(SystemProperty.getResultConfig("ORDER_GOODS_EXIST"));
 
 

ace-common/src/main/resources/properties/systemconfig.properties

@@ -45,18 +45,17 @@ APP_PARTNER=1539689201
 APP_PARTNER_KEY=xxfcXXDfangche74upyuns3AD4334533
 APP_TRADE_TYPE=APP
 #\u652F\u4ED8\u56DE\u8C03
-weixinHost=xxtest.upyuns.com
+weixinHost=chwtest.upyuns.com
 #\u8BC1\u4E66\u5B58\u653E\u76EE\u5F55
 APICLIENT_CERT=D:\\cert\\1514583081_20181017_cert.p12
 
 #\u652F\u4ED8\u5B9D\u914D\u7F6E
-ALIPAY_APPID=2019070965781964
-ALIPAY_PID=2088531634846583
+ALIPAY_APPID=2021002117657130
+ALIPAY_PID=9339653044
 #\u652F\u4ED8\u5B9D\u516C\u94A5
-ALIPAY_PUBLIC_KEY=MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAj/EMaAD2iJP3I5M0g6pssDDe3RxF5I3ECM/Kz/btM0RiW2g5oRrHSjtGuos9l1QhQAY0SrVqa2eZdPKUB3ZqJdimQiXr3dbiMvG9UCs8vVUcrtCHCBjDllKQLiYzboxE6JLXyfII5tIXbFKiGyiEyXQnffUhQ9uGyT2EGWGecz6PLIjDdbwpxuzF2gIUzV3bPxb+0axejBxJ/3zKnWrsbyq2nvs8XrzrR2CEggNqgqsKzaacCL1yZjXzQRseSnCMtgSxR5W5afbdY0zqbUlLHUrUZ8ycCRC0ECuI9HyTbuqtdWHEZH7vIH44wEQWZPDRhMfMZvzmPUgpTWZLv5BtaQIDAQAB
-ALIPAY_ACOUNT=xxfc810@163.com
-ALIPAY_PRIVATE_KEY=MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQC0wXVGAameVSLlLrq7edrMuoabN16/bYJNosLmPlHltEhehKO1ak/oIFvlKGyKwsW+xXd8t27p5hpsHqzNisU/jLbwEi6t0U/RBMbx3ult9zNhsZqSdJxe4QINChudVM6FdE8ssaq19ABwiLisMxxck0IiXDmesGI6vUSNzLEvKyYWTUsVsW1HgYXVjXmi8mOiwuFsJtdALS/psWci3UlX80rYG9KGqSBWT0B0Nr8UcM1L7UEkOHUEf1uq4Ipl5rTzgqoRQN5uHbBu50b7welAL2MFA9D/Ecv+FOfMIiLBtm1/6zNtjo/mvwORtS64mJXCaAbY1Pxa1bqs274fAwWtAgMBAAECggEAOObZ2zL0yZI1jP477H68wUxKyZwRqKN5rKT7Q+4EbBJn4dFRk++mvgVJyIcEPF56T8bsCYfZU6qLUNQLRB1WYN4UTNj8dt14ie0+D7BDvclfFHcLmOU6wKeGtMIk1U94QAzQS9qWSfdJGCQCNrtUR1RYMmbkAK+4DJO+fAEfGiCr1oMQpsz0h6Jhwp/DDBXZEjPdrECOjx2w5ZVULyPxFui2NQ8IS3rTT5SQvOBAgn9dbgZ/FVVbs2x6SpnWyOCUREK0uaLXJgf0JoX1WW4bswZlYmd7qURPscwFVKdYRautimcmO0FOUue62aPSYfvJwx8tTZanQbbwfrr0XrisBQKBgQDyKPYDYZzgGL/G5H8CQZajKnqg7a5AAZXJQLKkF7kiEgOlB3b6OqK6CeKVGawfuNIshECmmKcZmqrsPV42xrZl458kiDyqJNHq2lgFs9kj9BFUDi11EZfDGah4piJo5tgc09Hj6eAmeKdmG7aTS0/954xOK7eBFdG1T6R1Rd9Y4wKBgQC/Fhd5Nw6XYAg4qBmzOnvc9YwEL+wdy0aontFAFzaQlgkYm+efhYyjMcjyj4aloJZzpTd6eKbZI57IzihJI+F8+b1qToQDu8A2BTPkiOyXRcNY3y0LTNx7/gae6a9oGFc+8ILGa41va7WKjuPd08aXpSSBI34u10wWRMP+70m8LwKBgQCLerRYtjyZhyfO84WEUyrkyG7hioU3MLKJvM4oXdGwohefUnFhJ6za4x6zKppNmzLTmUlzq7FzufaBI8fEXShp/3WGoUHv7k1KrIDOqAyF/OqOM6xTJdL3+StkcqyXJ3+K+yaF1AvbnNsuoP/ETzi/0kKqM9v6agrkF/9t3NUMaQKBgCpafS1y1Jscv/W+3KNrLRUWn8g1zwHzkl/Bg+POwVtexflcZQRol3l8iWuqAFApve84CYntwB2U1ZbwiuFbQJlwyVkMuhoRvVK76HqZFseYwOmr3dIJYT1iWplSdnx+GKhsqq/MGvc9SmnBriP20qe+BM9SzJ8ZPVYaO87/vrolAoGARD8/IeEzMCPfYr9zBkE5rBtiT7t6nZXmMc6GH2Vao9meDofN8vj/XEfTGovusUYTWyA2Enac0YKdK6f6f+NYBqGYqn5Ludgxeotzo9UoXd3Hnv1gMCRs4ehloVODkHj2qhkvqL2iuZLsNp/wMq/ZHpRUzT4bO5H2FQhH4SUElKI=
-#
+ALIPAY_PUBLIC_KEY=MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAjpxnKpGrzPGAo4re3ijxKLJoajMGI6ywCHoiKvADGZnuPlbYdZ4bV/qIYTiMSnjMfHKnRtfdeFBWvEpAdV0bMFZi9d/5eCsvLF/GCzgvAzLrjiJltc/fRA4xXXELjmUhQc14x7s80hbXZ0Ta+zEZOnWj32VEJ92XAHR6rNSG3cdbqphJvcyBv43jozaSKFf59IsfbhxouRL4T0VMYn7kijXpPgz2/wivIh5zffw4rlHtlYLYZNSLtXEjG1onoS6QmH/i1QuqbeMVUFPCyN7snCN6FXJ4PzQ4E9x5JfOiUlqde9PYaLSCZ9KEJodk9fW+sqwetJYfDCQKtjtmr3aTCwIDAQAB
+ALIPAY_ACOUNT=843295884@qq.com
+ALIPAY_PRIVATE_KEY=MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCFVL6YIDBFIoEgCyJ+41yoMj/lIVrnhaugunvoLM4oXhUG4ZZbXexJS12dOzUerXHa+edEfCRUj6rbGh341UjQ7OJHSn7jG7OUYO70/1RH8GDboaNxQuuct9PvicQ/cv2X0NRkVo2q2lzt+XA7wYG5uEm1dwPlavDtfLzg/YWRjbIvgHcSF8NIYh7yYBRQ3vUITnCDoQl4hiVU712VYDuAcHt7LEM6o6BWwO14iV8p3C00XDDxpTv3p2CSi8KaSNgQQd9w1Zi2ma8YQ/L+Liek0FujeI16O/ixZdDMgX1dL65/afuRTikNAQ3fiVrvJ3thKBIVbFPwAXrRliNzWiABAgMBAAECggEALhNzKi81fy7FYMV4TlFUG+wBmLVGLOxMu2a2my2gsOKScaZTx49VsJ6S41sqqEdYKUxjV49vHqnnaYBFC1DpsQmryOc9ok5YaNZ2vcPe5F11m3DogqOVuLruSsFZSHP8nxJT07j1jC2aH8MrvfrJUd0V29gdSJMEX43T2AzEs9+7CFiR96pRoUi49c7F9Ot/I0WjEFav7CphElVPhSLNT8WPlBHbCKFe3ptEDKDs3n/HcPrURrHHGA++caCbjJzAPqIlVUWQyFtKj1W5RKyU+6CT9yqxCE+n6bq+r07qWqsSxkiSiF6G/6umlIHnvpR8txDmLFUfSzvmP1t3V8uAAQKBgQDSSzzaAYw3N3eoor9GxbOVwmNwVg8fl0cdtCvcHQjt8C89S98x/rF1O06ZV0dsWnSZWMKz7TuXhZhgfZ+IX8vBiq1BF7zbEqS8uRFCLBgHL6CXN/jkF85LZI4sqXJCr20mAeedh1dvc9+HIOC7B/AnvSlXEIpzjRPIOshM5zsEwQKBgQCiT0oZIN0wPdTqQW8dnt29VN/8w8AHU7OIEnMBID0NJmwc45jbCkBkzNdOWAAZs1HOztLZsCgEXkSkAtkWuM/0e5tD7V1lrZYlV97EapJD0ADXDQRoJwKEl5iEpR8JBCWrprTRDUwvoFXQK4ceULJznJthzGsatUWTiSFROHGrQQKBgQDCswAbA5XTRZqW2l9n4gE8Jaa1SihkYkZonPiCqasryNWj1cxG2H1qgcdqt2EcU79ifsh9l6Y1ym3i4ExFEhRvE7sG6jhjSCaXyGzPLE3u0UzI1PyuCdBpAyeS+CsezJasutS7h6QPP2P0Ex+eamISGNPelSTqiPKIzsvGT8vXwQKBgCCbaTlvHsCIS3PcPWRn/AgDOxRehv9x00ls22nIfjtcErAjERxADPuzIzX7+9kt6ytu5XESMJfgEE4avF4SNsTY6DJXR0IcA2PxKTGwbz3sVZ7eYJpD6/+TLPLI8VkwWhkH3p942mte/J5bgEOY1qDfP2AAXyv4asfe7rCQdFWBAoGANtz6clweodb6YQ0fYpZs5WXDyN3A23dgPPA2LgdofbiBdbHB3t7MwyJrxuPBVsAQZSWWkpJZy67gZqp1BtofOzfDUuzR0usDyDWtkhYQIukztShGRZWNj7nLhqQenO+5YJx47NgFZVADYLx1+bp4Ft8Wk5a0xftFUFK9B8G5AmI=
 #ALIPAY_APPID=2016100100641990
 #ALIPAY_PID=2088102178153042
 #ALIPAY_PUBLIC_KEY=MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA47AID6hZLPRBUZ9sZT6PYuif6ii+W6OptEMhDCWaDNZsknK8eW2w3I3b57+/vtV8WMulBopvjIpOgIVooDLxZCiiDtymauNvGu7WkqTu1TSJ/brPphMjU0sWl5XyE4NcMpLZoQALCXd3b7AQP3K4vco8wcxBwdjj9Es6LB19iLnUPXK5LPPTvPR+nVihtnP6Bw2gFQZWCAALti6q9HT7c77agsPO6CGyx6dLoO9IFLFME+E2BvVVKbrdzHBl2yhLLTeT7wWFs35tAlFfX9vj7cFH/cozMJUdw0PyxtpDuBJGwu4XhYWD5O5YcuNGxbuPRMTAPwqCjvQ0q474gi9R6QIDAQAB

rs-universal/rs-universal-server/src/main/java/com/upyuns/platform/rs/universal/UniversalApplication.java

@@ -14,7 +14,7 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
 @SpringBootApplication(scanBasePackages = {
         "com.upyuns.platform.rs",
         "com.github.wxiaoqi.security.common.handler"
-})
+}, excludeName = {"com.upyuns.platform.rs.gtdata"})
 @EnableDiscoveryClient
 @EnableAceAuthClient
 @EnableScheduling

rs-universal/rs-universal-server/src/main/java/com/upyuns/platform/rs/universal/biz/OrderPayBiz.java

@@ -95,8 +95,11 @@ public class OrderPayBiz extends BaseBiz<OrderPayMapper, OrderPay> {
 		//报名费回调路径
 
 		//临时处理
-		Map<String, Dictionary> dictionaryMap = dictionaryBiz.getAll4Map();
-		Integer demotion = Integer.valueOf(dictionaryMap.get(UNIVERSAL_PAY + "_" + PAY_DEMOTION).getDetail());
+		Dictionary dictionaryMap = dictionaryBiz.findDictionaryByTypeAndCode(UNIVERSAL_PAY, PAY_DEMOTION);
+		Integer demotion = 0;
+		if (dictionaryMap != null && StringUtils.isNotBlank(dictionaryMap.getDetail())) {
+			demotion = Integer.parseInt(dictionaryMap.getDetail());
+		}
 		amount = amount / demotion;
 		if (amount <= 0) {
 			amount = 1;
@@ -344,6 +347,7 @@ public class OrderPayBiz extends BaseBiz<OrderPayMapper, OrderPay> {
 				"\"subject\":\"" + orderPayVo.getSubject() + "\"," +
 				"\"timeout_express\":\"30m\"}"); //订单允许的最晚付款时间
         try {
+        	log.info("{}", JSONObject.toJSONString(request));
             AlipayTradePrecreateResponse response = alipayClient.execute(request);
             log.info(response.getBody());//就是orderString 可以直接给客户端请求，无需再做处理。
             return response.getBody();