update

application/init_app.go

@@ -61,18 +61,21 @@ func parseInit() {
 	if confType, ok := os.LookupEnv("CONF_TYPE"); (ok && sliceutils.NotContains([]string{"local", "nacos", "consul"}, confType)) || !ok {
 		return
 	}
+
 	if err := config.ParseConf(); err != nil {
 		fmt.Println(err.Error())
 	}
+
 	logger.Info("[conf] parse conf finish.")
 	if err := xsf.Init(); err != nil {
 		logger.Fatal(err.Error())
 	}
+
 	logger.Info("[xsf] initialized.")
 	if err := idutils.Init(); err != nil {
 		logger.Fatal(err.Error())
 	}
-	logger.Info("[dxsf] initialized.")
+	logger.Info("[idutils] initialized.")
 }
 
 type Application struct {

config/xpkg.yaml

@@ -136,56 +136,29 @@ oss:
   region-id: oss-cn-hangzhou
   bucket-url: https://dev-athena.oss-cn-hangzhou.aliyuncs.com
 
-extend:
-  rpc:
-    athena:
-      srvAddr: http://athena.qitu
+rpc:
+  - name: public
+    addr: http://dev-carapi.wanzhuangkj.com/public
+    groups:
+      - name: text
+        apis:
+          - name: contentSecurity
+            uri: /contentSecurity/index
+  - name: pay
+    addr: http://dev.wanzhuangkj.com/api-order
     groups:
-        - name: bike
+      - name: order
         apis:
-          - name: create
-            uri: /internal/athena/api/v1/bike/create
-          - name: deleteByID
-            uri: /internal/athena/api/v1/bike/deleteByID
-          - name: deleteByIDs
-            uri: /internal/athena/api/v1/bike/deleteByIDs
-          - name: updateByID
-            uri: /internal/athena/api/v1/bike/updateByID
-          - name: updateByIDs
-            uri: /internal/athena/api/v1/bike/updateByIDs
-          - name: getByID
-            uri: /internal/athena/api/v1/bike/getByID
-          - name: getByIDs
-            uri: /internal/athena/api/v1/bike/getByIDs
+          - name: getOrdersByChargeID
+            uri: /order/get/internal/payOrders
+          - name: notifyChargeOrder
+            uri: /order/updateChargeOrder
+  - name: ucenter
+    addr: http://user-center2:9901
+    groups:
+      - name: operator
+        apis:
+          - name: getOperatorByID
+            uri: /agent/getOperatorNicknameAndPhoneById
+            
+extend:
\ No newline at end of file
-          - name: page
-            uri: /internal/athena/api/v1/bike/page
-          - name: exportCSV
-            uri: /internal/athena/api/v1/bike/export/csv
-  third-party:
-    baofu:
-      bct-terminal-id: ""
-      bct-member-id: ""
-      bct-version: "1.0.0"
-  wx:
-    appId: ""
-    appSecret: ""
-  pay:
-    addr: http://pay.qitu
-    reconciliation:
-      pull: /pay/reconciliationSummary/pull
-      pullNotify: /pay/reconciliationSummary/pullNotify
-      notify: /pay/reconciliationSummary/notify    
-  service:
-    operator: # 麒兔运营商服务
-      server-addr: "http://athena-prime.qitu"
-      site-list: "/internal/operation/siteList"               # 运营商下站点列表
-      pay-notify: "/internal/notifyPay"               # 支付成功通知
-      refund-notify: "/internal/notifyRefund"                 # 退款通知
-      login-token: "/internal/partner/getLoginToken"        # 获取运营商登录token
-      intake-notify: "/internal/operation/create"     # 进件通知
-      notify-pay-success: "/internal/notifyPay"               # 支付成功通知
-      notify-refund: "/internal/notifyRefund"                 # 退款通知
-    public: # 公共服务
-      server-addr: "http://car-public.car-iot:18306"
-      validate-sms: "/sms/validate"                     # 验证验证码
-      sms-send: "/sms/fishSend"                     # 发送短信(批量)

xutils/idutils/idutils.go

@@ -49,7 +49,7 @@ func Init() error {
 			}
 		}
 	}
-	logger.Infof("[dxsf] type: %s", config.Cfg.App.IDGeneration.Type)
+	logger.Infof("[idutils] type: %s", config.Cfg.App.IDGeneration.Type)
 	return nil
 }