Merge pull request #53 from alexzyWu/dev-0.3.0-cc

feat(cc): Update cc module
WeBankFinTech · Apr 7, 2022 · 750b5f6 · 750b5f6
2 parents 21fcfd5 + 7aeb17e
commit 750b5f6
Show file tree

Hide file tree

Showing 154 changed files with 14,701 additions and 2,429 deletions.
diff --git a/cc/Makefile b/cc/Makefile
diff --git a/cc/build/mlss-apigateway/Dockerfile b/cc/build/mlss-apigateway/Dockerfile
@@ -1,5 +1,7 @@
 #FROM dev.sf.dockerhub.stgwebank/webank/mlss-go-cc:golang-1.12
-FROM uat.sf.dockerhub.stgwebank/webank/mlss-di:ubuntu-latest
+#FROM uat.sf.dockerhub.stgwebank/webank/mlss-di:ubuntu-latest
+#FROM ubuntu:latest
+FROM golang-dlv:latest
 
 COPY mlss-apigateway /apigateway/
 WORKDIR /apigateway

diff --git a/cc/build/mlss-controlcenter/Dockerfile b/cc/build/mlss-controlcenter/Dockerfile
@@ -1,6 +1,6 @@
 #FROM dev.sf.dockerhub.stgwebank/webank/mlss-go-cc:golang-1.12
-FROM uat.sf.dockerhub.stgwebank/webank/mlss-di:ubuntu-latest
-
+#FROM uat.sf.dockerhub.stgwebank/webank/mlss-di:ubuntu-latest
+FROM golang-dlv:latest
 COPY mlss-controlcenter-go /cc/
 WORKDIR /cc
 

diff --git a/cc/config/application.yml b/cc/config/application.yml
@@ -0,0 +1,144 @@
+spring:
+  profile: dev
+  platformNS: mlss-dev
+  datasource:
+    driverClassName: com.mysql.jdbc.Driver
+#    url: jdbc:mysql://10.107.108.178:3306/mlss_gzpc_bdap_dev_01?useUnicode=true&characterEncoding=utf-8
+    url: jdbc:mysql://localhost:3306/mlss_local_db?useUnicode=true&characterEncoding=utf-8
+#    url: jdbc:mysql://10.35.1.46:3306/mlss_local_db?useUnicode=true&characterEncoding=utf-8
+#    username: root
+#    password: 123456
+    username: mlss_gzpc_bdap_dev
+    #    password: root123!
+    password: mlss@2018
+#    ip: localhost
+#    port: 3306
+#    db: mlss_local_db
+    ip: 10.107.108.178
+    port: 3306
+    db: mlss_gzpc_bdap_dev_01
+  tokenDB:
+    username: hdfs_gz_bdap
+    password: hdfs@201901
+    ip: 10.107.108.111
+    port: 3306
+    db: hdfs_gz_bdap_test_01
+server:
+  port: 7777
+  servlet:
+    context-path: /cc
+  session:
+    timeout: 86400
+  error:
+    whitelabel:
+      enabled: false
+
+logging:
+  level:
+    root: INFO
+    cn.webank.bdp.controlcenter.dao: DEBUG
+  path: /var/log/controlcenter
+
+core:
+  interceptor:
+    configs:
+      - name: IpInterceptor
+        add:
+          - "/v1/auth/access/namespaces/**/notebooks/**"
+        exclude:
+      #      - "/v1/**"
+      - name: UserInterceptor
+        add:
+          - "/v1/**"
+        exclude:
+          - "/v1/login"
+          - "/v1/logout"
+          - "/v1/alerts"
+          - "/v1/alerts/training"
+          - "/v1/auth/access/namespaces/**/notebooks/**"
+      - name: AuthInterceptor
+        add:
+          - "/v1/**"
+        exclude:
+          - "/v1/login"
+          - "/v1/logout"
+          - "/v1/alerts"
+          - "/v1/alerts/training"
+          - "/v1/auth/access/namespaces/**/notebooks/**"
+    maxTokenSize: 10000
+    maxTokenExpireHour: 24
+    defaultTimestampTimeout: 2592000
+  um:
+    host: 10.107.96.15
+    port: 8088
+    appId: "0015395862955265"
+    appToken: MLSS-DI
+    appPem: "-----BEGIN PRIVATE KEY-----
+          MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDAn+BWO+9o5DEH
+          4yUrGGJgnIjlLDDLXuxjnq/vrl/+i/02b9usgWZQ6yLRVHao2FX7MfuFob90Xb8k
+          5WB2pE3uEMBt3e4kq8WwO3CRJT0e+lkZvb0ygeUCSQQISJPiRMco0e8S2WWBVVUo
+          6IwOLt5MvRw5H1VL7qrOaqjuKaK5FH35qm/dJsjNwnG8Xmi8zb8b0Mz57y49OXv7
+          8fKXlc7pTBVpnspBWdPZzQcu1NRn76PjyR6cF9ZmLtQSHe0uz2tMqF7ps6Q0f/Ik
+          jSYVhI6SWsRRAg3gmShvkLcwy6Ovt1zlQecESD+Uk1+YTmPW+2nQm3k0OX6P6oQV
+          XJ6j2GgvAgMBAAECggEBALxJSuNgMLRKIfdAvCs06azgNhw1pviUL+Ns0TMrMyBB
+          PGFC0+r6jcXZIi6WLmr7FIi3IdJM+jVIEbiCElnGX3qumzqJrefglBug7naifO1T
+          71ZvFopRWEZ0kuF5+Dw72KV5GAVHxaW3gMe9EHIotBk03Wqkyx6vC/07Wyd6QVpB
+          EGdfuNjLtDwT0KiBSXQ4e6cDjAI5KXfMDSD2x0J2EHqEy07nNCztckW7aJkPz4i/
+          1AqPnnpUW2ovSUKVEOkbSmTZiS8ONow2XfvTrIioBj4Rnk136gRUsJ5NuiVqRh5L
+          pNaARMhuv+cwu9oU78niOs7B7F92uAKYA1NjVyDxgKECgYEA40xpKPIrV4zjpfop
+          3flghOu6i1F+YmEtCka2zH0h7KetkJGy3wh6y300g2oOsbPRAn5gW3A+3rzR+mKu
+          h+mU3iw2Ug2jw0BslvMUMSzWQ/IZyb7Yn9F9+nueAHrZWCr5zJNzuXZrwqItbHqi
+          NgidaLigi9LKoB/kCNKGnWlcnp8CgYEA2PKauQ8dEfoiLkaC6FL9dltD1kHbkmDm
+          YHLFUPYmZNdua+R2q5ccZLR5KMcJxdBa9CvzCNEtuUJGLqICuKBUPqo6/6JEfHWh
+          6Vxor84yIl40kKzveaeshnHRmXdN8xKR/BijsoI0zXRR4nbqloTfiLdpzhjMRiMz
+          05t1+GNDHHECgYBgURHCuxPorpgMzjwNhs4CpU1QGgFfOOR4FU0CzAejG86tkz/j
+          yNkX/39QLJH7dUIdN2YneSH7CrJD0qs4hp+BoeSG0qbRZyxcrragu+ozspSA6/Ep
+          kAE9MkLa2zPca6GcseL49RhmyohLDpBMK0xggtPtTC52uezMXEGU1H/d6wKBgEhM
+          6dV8vPJtyxBi/WORrNjR55SzFAr/cid4eFvX/Mmkpi8cz5O144eIQcyeMJqVKoqv
+          TuqEU9mmxZ7q7T88Z3cO4mSpXmugBFqyKk1UyY58mMYSbCi+AZg4vGKJyReV+8Lp
+          Lzzhedlyx4tSmDGbjKeSgJdn2kQRnUcLS1CBPC9xAoGAf8Qya9WsB5a0GkhYrAFU
+          FoYyNfHWpXt8Hh1uja/X284vnVs+szQ1eB4CecsjLssmoPBAbidh0QHAHX36KehQ
+          0qFNcF3ddBAves3tfXPikb2vrR4Cv2XnVvlzAdlFeiJs8I14E4oNwuNG661HpOnw
+          JYexQ9KCFZMkvplb10Nr8fE=
+          -----END PRIVATE KEY-----"
+  sso:
+    defaultService: http://10.255.32.137:7777/home.html
+    casServiceUrlPrefix: http://10.107.99.46:8080/cas
+    casLogin: http://10.107.99.46:8080/cas/login
+    ssoLanding: http://10.255.32.137:7777/ssolanding.html
+  ims:
+    accessUrl: http://10.107.118.38:10812/ims_data_access/send_alarm_by_json.do
+    subSystemId: 5265
+    alertWay: 1,2,3
+    alertReceiver: luckliu
+  kube:
+    apiConfig:
+      sysProperty: "user.dir"
+      defaultPath: "/certs/config"
+      path: "/etc/config/kube-config"
+    namespacedResourceConfig:
+      defaultRQName: mlss-default-rq
+      defaultRQCpu: 0
+      defaultRQMem: 0Mi
+      defaultRQGpu: 0
+  es:
+    #    address: elasticsearch
+    #    port: 9300
+    address: 10.107.105.207
+    port: 30782
+    learnerIndex: dlaas_learner_data
+    dateIndex: logstash-
+  gateway:
+    bdpAddress: http://10.107.105.207:30795
+    bdapAddress: http://10.107.105.207:30794
+    bdapsafeAddress: http://10.107.105.207:30796
+  authAddress:
+    user: http://10.107.105.207:30800/cc/v1/inter/user
+    auth: http://10.107.105.207:30800/cc/v1/inter/auth
+    ip: http://10.107.105.207:30800/cc/v1/inter/ip
+  cache:
+    cacheTime: 24h
+    defaultTimestampTimeout: 30000
+  cookie:
+    defaultTime: 86400
+    path: "/"
diff --git a/cc/go.mod b/cc/go.mod
@@ -1,40 +1,47 @@
 module mlss-controlcenter-go
 
-go 1.12
+go 1.13
 
 require (
 	github.com/IBM/FfDL v0.1.1-rc
-	github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d // indirect
 	github.com/caddyserver/caddy v1.0.4
 	github.com/dlclark/regexp2 v1.2.0
 	github.com/fastly/go-utils v0.0.0-20180712184237-d95a45783239 // indirect
 	github.com/gin-contrib/location v0.0.1
 	github.com/gin-gonic/gin v1.5.0
+	github.com/go-ldap/ldap/v3 v3.2.4
 	github.com/go-openapi/errors v0.19.3
 	github.com/go-openapi/loads v0.19.4
 	github.com/go-openapi/runtime v0.19.11
-	github.com/go-openapi/spec v0.19.3
+	github.com/go-openapi/spec v0.19.6
 	github.com/go-openapi/strfmt v0.19.4
-	github.com/go-openapi/swag v0.19.5
-	github.com/go-openapi/validate v0.19.3
+	github.com/go-openapi/swag v0.19.7
+	github.com/go-openapi/validate v0.19.5
 	github.com/google/uuid v1.1.1
 	github.com/jehiah/go-strftime v0.0.0-20171201141054-1d33003b3869 // indirect
 	github.com/jessevdk/go-flags v1.4.0
+	github.com/jinzhu/copier v0.3.5
 	github.com/jinzhu/gorm v1.9.12
 	github.com/kubernetes-client/go v0.0.0-20200222171647-9dac5e4c5400
 	github.com/lestrrat-go/file-rotatelogs v2.3.0+incompatible
 	github.com/lestrrat-go/strftime v1.0.1 // indirect
-	github.com/mattn/go-isatty v0.0.11 // indirect
 	github.com/patrickmn/go-cache v2.1.0+incompatible
-	github.com/pkg/errors v0.9.1 // indirect
-	github.com/sirupsen/logrus v1.5.0
-	github.com/spf13/viper v1.6.2
+	github.com/prometheus/common v0.10.0
+	github.com/seldonio/seldon-core/operator v0.0.0-20210122151420-b881f99ebc1f
+	github.com/sirupsen/logrus v1.6.0
+	github.com/spf13/viper v1.7.0
 	github.com/tebeka/strftime v0.1.3 // indirect
-	golang.org/x/net v0.0.0-20191027093000-83d349e8ac1a
-	google.golang.org/grpc v1.27.1 // indirect
+	golang.org/x/net v0.0.0-20201202161906-c7110b5ffcbb
 	gopkg.in/cas.v2 v2.2.0
-	gopkg.in/yaml.v2 v2.2.7
-	k8s.io/api v0.0.0-20190620084959-7cf5895f2711
-	k8s.io/apimachinery v0.17.2
+	gopkg.in/yaml.v2 v2.4.0
+	k8s.io/api v0.18.8
+	k8s.io/apimachinery v0.18.8
 	k8s.io/client-go v12.0.0+incompatible
+	k8s.io/utils v0.0.0-20200729134348-d5654de09c73 // indirect
 )
+
+replace k8s.io/api v0.18.8 => k8s.io/api v0.18.6
+
+replace k8s.io/apimachinery v0.18.8 => k8s.io/apimachinery v0.18.6
+
+replace k8s.io/client-go v12.0.0+incompatible => k8s.io/client-go v0.18.6