Merge branch 'dev/dev_xp' into dev/3.1_release_merge

# Conflicts:
#	src/main/java/com/ai/da/controller/AccountController.java

src/main/resources/mapper/primary/AccountMapper.xml

@@ -26,7 +26,8 @@
     <update id="toVisitor">
         update t_account
         set is_trial = 0, credits = 0, system_user = 0,
-        organization_name = null, credits_usage = null, credits_usage_limit = null, sub_account_num = null
+        organization_name = null, organization_id = null, credits_usage = null, credits_usage_limit = null, sub_account_num = null,
+        parent_id = null, subscription_plan_id = null
         where id = #{id}
     </update>
 

src/main/resources/messages_en.properties

@@ -189,6 +189,22 @@ do.not.have.the.permission.to.delete.this.comment=You do not have the permission
 unknow.affiliate=Unknown affiliate id.
 unknown.operationType=Unknown operationType.
 unknown.mode=unknown mode
+unknown.subscription.plan=unknown subscription plan
+unknown.subscription.status=Unknown subscription status.
+subscription.has.expired=Switch failed. The subscription has expired.
+unknown.administrator.user=Switch failed. Unknown administrator user.
+no.permission.manage.subscription=Switch failed. You do not have permission to manage this subscription.
+unknown.organization=Unknown organization.
+valid.subscription.period=The plan is still within its valid period. Please delete it after it expires.
+users.currently.using.this.plan=There are users currently using this plan, so it cannot be deleted.
+deletion.failed.please.try.again.later=Deletion failed. Please try again later.
+subscription.plan.has.been.deleted=This subscription plan has been deleted.
+subscription.plan.does.not.exist=The subscription plan does not exist.
+ID.cannot.be.empty.and.must.be.greater.than.0=ID cannot be empty and must be greater than 0.
+invalid.time.format=Invalid time format. Please use the yyyy-MM-dd HH:mm:ss format.
+the.start.time.cannot.be.later.than.the.end.time=The start time cannot be later than the end time.
+page.size.limit=The number of items per page must be between 1 and 100.
+page.num.limit=The page number must be greater than 0.
 
 # 可能会报异常
 # Informative:

src/main/resources/messages_zh.properties

@@ -185,6 +185,22 @@ do.not.have.the.permission.to.delete.this.comment=您没有权限删除此评论
 unknow.affiliate=未知推广者id
 unknown.operationType=未知操作类型
 unknown.mode=未知模式
+unknown.subscription.plan=未知订阅计划
+unknown.subscription.status=未知订阅状态
+subscription.has.expired=切换失败，订阅已过期
+unknown.administrator.user=切换失败，未知管理员用户
+no.permission.manage.subscription=切换失败，您没有权限管理该订阅
+unknown.organization=未知组织
+valid.subscription.period=计划仍在有效期内，请到期后再删除
+users.currently.using.this.plan=存在用户正在使用此计划，无法删除
+deletion.failed.please.try.again.later=删除失败，请稍后重试
+subscription.plan.has.been.deleted=该订阅计划已被删除
+subscription.plan.does.not.exist=订阅计划不存在
+ID.cannot.be.empty.and.must.be.greater.than.0=ID不能为空且必须大于0
+invalid.time.format=时间格式错误，请使用yyyy-MM-dd HH:mm:ss格式
+the.start.time.cannot.be.later.than.the.end.time=开始时间不能晚于结束时间
+page.size.limit=每页数量必须在1-100之间
+page.num.limit=页码必须大于0
 
 # 可能会报异常
 # Informative:

src/main/resources/payment.properties

@@ -27,20 +27,20 @@ paypal.webhook_id=1D107312EX592781K
 ##### Stripe
 
 # developer
-stripe.private-key=sk_test_51P4ZZL02n1TEydyN8qQHjOA9imsFU7Oxs2HMHGy2urHnnQgSHnZuu5vVP6pKhEACwUpsKNyrbZpdcg5TJWJLRHcY008dEO1fn2
+#stripe.private-key=sk_test_51P4ZZL02n1TEydyN8qQHjOA9imsFU7Oxs2HMHGy2urHnnQgSHnZuu5vVP6pKhEACwUpsKNyrbZpdcg5TJWJLRHcY008dEO1fn2
 # dev 端点
-stripe.webhook-sign-secret=whsec_e0dBiJngx6qqgJj6yPyJ2A9ouh1Cjv5w
+#stripe.webhook-sign-secret=whsec_e0dBiJngx6qqgJj6yPyJ2A9ouh1Cjv5w
 # local 端点
 #stripe.webhook-sign-secret=whsec_TJcMSnAkh4uktrNY1M6Iy8XaVze4Rzqm
 
 # kim - test
-#stripe.private-key=sk_test_51LwPrxH7nPZ8bkrNj67TFD7sxucaTANs1lf0KGSu1QSJfxYXcnigq2wTaZyZzST7y0fMbhhvaJZ4LjjFhr95M83a00eXrmOTL0
+stripe.private-key=sk_test_51LwPrxH7nPZ8bkrNj67TFD7sxucaTANs1lf0KGSu1QSJfxYXcnigq2wTaZyZzST7y0fMbhhvaJZ4LjjFhr95M83a00eXrmOTL0
 # prod 端点
 #stripe.webhook-sign-secret=whsec_GoyVEAaBtuGD5Rt55z83JnPnLDAZTN3u
 # local 端点
 #stripe.webhook-sign-secret=whsec_NvwM3hDQiN5GXclYOYekE9IKHLjmROF8
 # dev 端点
-#stripe.webhook-sign-secret=whsec_pX0pPMQm85PaUSWnFMEzoccb3MGNkjoL
+stripe.webhook-sign-secret=whsec_pX0pPMQm85PaUSWnFMEzoccb3MGNkjoL
 
 # kim - live
 #stripe.private-key=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