update

12060476_oss.scnict.com_nginx/oss.scnict.com.key

@@ -1,27 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIIEogIBAAKCAQEA1D9NDtJ5rLxP8t7KZgNm1HKMzbhAsi/EUmQr5xIbaB9reoVb
-3Bcvj7REtUmdHBgMyZcDI4rc7Sw5jXE2xHndnA1J+WRwIVMtKso/g+FUvwoNEZ8n
-E51MwdQ+MZSPBZwL2pwycoojt/QE3GCi3/deS8CSMLm4QNpJYu/G513Pi8TrVbH8
-E9lqMTpht9uRSVY7u9tWoWQ7Yh+2sgNIWAcO0KpYiUbQhj9myzBL+HMNKgtfU7PU
-Ynu3KnxJqRHRxMXmvnhyD+Rhy2mZUlaPchb0hKraSW1ET9k3oI7E7PThArfsdAgc
-TBYVj/OjcR5MhGNE6xs5KPx1TzRxR4dLNoWNSwIDAQABAoIBAD6T3UnZ94Lc0KuY
-UU9rgFVx4p7CzNxcZgMuwpzxwz/bR6qLiC5nbZ/uc/WJWzeNxbNoAUZo6kNJLzzL
-HO0nyxV3+4/6s2634dDEaZ6eAIkE0x6XcIOBdMCPLbkbhmGOhRYyyFLp9KcHXKmH
-Gm5zNguant+b2j3QviNb86aCi6822c03slZw+f2Hp6MPy/AKophSqhXUwpogFHZq
-Y5bYZczmvPyI8l8LwOjHkjRMXPtibxMMYXA2W76DCC95mC+SeP6kCEELf0cZGx+W
-RYqi3YVGk0gLtpyjmAmrjHzfTXTKBnt6NC7ibx/Y2Sef9/6VXvmENrVQIWthvYj+
-cJSwd5ECgYEA9jTKlht5vvldpnt3GuZxDHiAzKSgi21ZrmLnE0fU37bwYRe4zHDD
-FXG0Zt9LxGIshUIkLKNYhK0cxrLReN2Bapq5C8fXWQTY7jnrm7hO5TOR+UaOkoK+
-M3AR/Q3AsWXimU45ap0fP9l42UGZGComj9EvKuHnYgFsUAehPWOzqJECgYEA3LCx
-dICX/zxD+iNrWF+P7UBh63jcgoVZRZkZn6qp+/7zOQc1HiNGpcAn5B6cbuGKiypj
-13YBvOo6bPE7pE6GzrsuXcSgRvbaFxw9z8ogB6FvyKG+NNV0yAKFAZP+QJwQq1GE
-9KsRR4DIWSdglwCcWzxyK6FJ99omlOpJA9NZZhsCgYAkav6kYYAKrZwaqhyeEAQc
-0h5LJvbQaOZhEyQXCAMG7Gp2Eio1o2BX5a/Hn7P3YoYvV+894xOO3IRrJ7wwYqNn
-/2brxS2nbz4fTtX4/LQ+1vf6pWMlbM1xklw20Df2hZmVD6sSiBc9PI/RoxBgMKvv
-jgOqFixBpPA+jkJdcEf84QKBgBBlXDnAmApRaud5nC8LooDI6L161D8qMxC1qC6x
-mkFrlpxlCbA8hLIpzYzoLU0bmpRuSM6oKMblTAPuBDVX1DIlu/MheZrsGhXfdkQq
-yyhl+Q0Z3yzDsxJtBX6xhRE9xwtDWjJnRzhdvATLpSRy2ir5Ga5eJEWywm0L3vLW
-z+yDAoGATbcAt/irUuF27efMEtjDoRm+degLcCozTeYdoaG4vPO+PHlsS4ZLL7wG
-ahvsJTv/frM05AW8dnJ9rS2U132TTAfMuQAzn4G8yuS89iHmvFWA8SCsQMRb/dIw
-c1kM+0SWeHHfxcy9AdoC7coZl2sUrqsCFjTzAqy3q77b9aCoGZo=
------END RSA PRIVATE KEY-----

12060476_oss.scnict.com_nginx/oss.scnict.com.pem

@@ -1,61 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIF9jCCBN6gAwIBAgIQDBMhvau1nbVWW2awrlJZOTANBgkqhkiG9w0BAQsFADBu
-MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
-d3cuZGlnaWNlcnQuY29tMS0wKwYDVQQDEyRFbmNyeXB0aW9uIEV2ZXJ5d2hlcmUg
-RFYgVExTIENBIC0gRzIwHhcNMjMxMjI4MDAwMDAwWhcNMjQwMzI2MjM1OTU5WjAZ
-MRcwFQYDVQQDEw5vc3Muc2NuaWN0LmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEP
-ADCCAQoCggEBANQ/TQ7Seay8T/LeymYDZtRyjM24QLIvxFJkK+cSG2gfa3qFW9wX
-L4+0RLVJnRwYDMmXAyOK3O0sOY1xNsR53ZwNSflkcCFTLSrKP4PhVL8KDRGfJxOd
-TMHUPjGUjwWcC9qcMnKKI7f0BNxgot/3XkvAkjC5uEDaSWLvxuddz4vE61Wx/BPZ
-ajE6YbfbkUlWO7vbVqFkO2IftrIDSFgHDtCqWIlG0IY/ZsswS/hzDSoLX1Oz1GJ7
-typ8SakR0cTF5r54cg/kYctpmVJWj3IW9ISq2kltRE/ZN6COxOz04QK37HQIHEwW
-FY/zo3EeTIRjROsbOSj8dU80cUeHSzaFjUsCAwEAAaOCAuMwggLfMB8GA1UdIwQY
-MBaAFHjfkZBf7t6s9sV169VMVVPvJEq2MB0GA1UdDgQWBBTicsvkt8v7TL0uprfF
-kvR7hMTuvzAZBgNVHREEEjAQgg5vc3Muc2NuaWN0LmNvbTA+BgNVHSAENzA1MDMG
-BmeBDAECATApMCcGCCsGAQUFBwIBFhtodHRwOi8vd3d3LmRpZ2ljZXJ0LmNvbS9D
-UFMwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcD
-AjCBgAYIKwYBBQUHAQEEdDByMCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC5kaWdp
-Y2VydC5jb20wSgYIKwYBBQUHMAKGPmh0dHA6Ly9jYWNlcnRzLmRpZ2ljZXJ0LmNv
-bS9FbmNyeXB0aW9uRXZlcnl3aGVyZURWVExTQ0EtRzIuY3J0MAwGA1UdEwEB/wQC
-MAAwggGABgorBgEEAdZ5AgQCBIIBcASCAWwBagB3AO7N0GTV2xrOxVy3nbTNE6Iy
-h0Z8vOzew1FIWUZxH7WbAAABjK/YYxkAAAQDAEgwRgIhAMZr8iVWt4Ls4ipCR+Zz
-/n/vZ+ETONyts5VIUs9jLHtMAiEA5v/l146vndx5c97l8VMZyAeeOh8gj3s6vA7s
-Wm2pjGYAdwBIsONr2qZHNA/lagL6nTDrHFIBy1bdLIHZu7+rOdiEcwAAAYyv2GMO
-AAAEAwBIMEYCIQDN9236oDZr9lYWQFEQS1tBUjWzqfWQiYkxxb+Axvcr8AIhALy/
-iapWCOvhfOfqjlWJSjVupoPW5HsqdAOw9KeEmodnAHYA2ra/az+1tiKfm8K7XGvo
-cJFxbLtRhIU0vaQ9MEjX+6sAAAGMr9hjCQAABAMARzBFAiBrp+NZHjeO4tTh2puE
-XTOMEZkS/G6RCAN5xoROWSgbpQIhAKqGOAOGOHXXoILCOI6VxzIeDf0fEpwRI1LI
-8+1CbpdbMA0GCSqGSIb3DQEBCwUAA4IBAQB8A672uX8mWLzhhJcYpon96A2Uo9VC
-/h/2Tu8uAngm/Js+XEv7UeR1QQmlrIHQz3VU6ys44TbUG1EX7MVhHiR86OBPHeWT
-l4vcQbKd7exyeKGuH8VJyXtOFOOy/+BIU52qFvJFH0t67WJI5+Ud9yXV8xc2drs/
-OAHNWYP/37inHGpve7fE1ckBGXgMmuKwKQVHgdqCH/reWPLhWEepsS8ptsHCnQlQ
-FS52CeQev4grlrzW42f5GFqaNvrPKvFdZkJhriGJ/MtwUV9BFwCWHtz8obg4uvbI
-Q3AZnahGUpu7sJZ867tTLeRM9OxPunk+QYn852CllDxyM+kitsk7qs0F
------END CERTIFICATE-----
------BEGIN CERTIFICATE-----
-MIIEqjCCA5KgAwIBAgIQDeD/te5iy2EQn2CMnO1e0zANBgkqhkiG9w0BAQsFADBh
-MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
-d3cuZGlnaWNlcnQuY29tMSAwHgYDVQQDExdEaWdpQ2VydCBHbG9iYWwgUm9vdCBH
-MjAeFw0xNzExMjcxMjQ2NDBaFw0yNzExMjcxMjQ2NDBaMG4xCzAJBgNVBAYTAlVT
-MRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5j
-b20xLTArBgNVBAMTJEVuY3J5cHRpb24gRXZlcnl3aGVyZSBEViBUTFMgQ0EgLSBH
-MjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAO8Uf46i/nr7pkgTDqnE
-eSIfCFqvPnUq3aF1tMJ5hh9MnO6Lmt5UdHfBGwC9Si+XjK12cjZgxObsL6Rg1njv
-NhAMJ4JunN0JGGRJGSevbJsA3sc68nbPQzuKp5Jc8vpryp2mts38pSCXorPR+sch
-QisKA7OSQ1MjcFN0d7tbrceWFNbzgL2csJVQeogOBGSe/KZEIZw6gXLKeFe7mupn
-NYJROi2iC11+HuF79iAttMc32Cv6UOxixY/3ZV+LzpLnklFq98XORgwkIJL1HuvP
-ha8yvb+W6JislZJL+HLFtidoxmI7Qm3ZyIV66W533DsGFimFJkz3y0GeHWuSVMbI
-lfsCAwEAAaOCAU8wggFLMB0GA1UdDgQWBBR435GQX+7erPbFdevVTFVT7yRKtjAf
-BgNVHSMEGDAWgBROIlQgGJXm427mD/r6uRLtBhePOTAOBgNVHQ8BAf8EBAMCAYYw
-HQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBIGA1UdEwEB/wQIMAYBAf8C
-AQAwNAYIKwYBBQUHAQEEKDAmMCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC5kaWdp
-Y2VydC5jb20wQgYDVR0fBDswOTA3oDWgM4YxaHR0cDovL2NybDMuZGlnaWNlcnQu
-Y29tL0RpZ2lDZXJ0R2xvYmFsUm9vdEcyLmNybDBMBgNVHSAERTBDMDcGCWCGSAGG
-/WwBAjAqMCgGCCsGAQUFBwIBFhxodHRwczovL3d3dy5kaWdpY2VydC5jb20vQ1BT
-MAgGBmeBDAECATANBgkqhkiG9w0BAQsFAAOCAQEAoBs1eCLKakLtVRPFRjBIJ9LJ
-L0s8ZWum8U8/1TMVkQMBn+CPb5xnCD0GSA6L/V0ZFrMNqBirrr5B241OesECvxIi
-98bZ90h9+q/X5eMyOD35f8YTaEMpdnQCnawIwiHx06/0BfiTj+b/XQih+mqt3ZXe
-xNCJqKexdiB2IWGSKcgahPacWkk/BAQFisKIFYEqHzV974S3FAz/8LIfD58xnsEN
-GfzyIDkH3JrwYZ8caPTf6ZX9M1GrISN8HnWTtdNCH2xEajRa/h9ZBXjUyFKQrGk2
-n2hcLrfZSbynEC/pSw/ET7H5nWwckjmAJ1l9fcnbqkU/pf6uMQmnfl0JQjJNSg==
------END CERTIFICATE-----

oss.scnict.com.conf

@@ -6,8 +6,8 @@ server {
 }
 
 server {
-        listen       443 ssl http2 default_server;
-        listen       [::]:443 ssl http2 default_server;
+        listen       443 ssl http2;
+        listen       [::]:443 ssl http2;
         server_name  oss.scnict.com;
         root         ~/web/assets;
 

pack-scnict/config-service.yaml

@@ -7,17 +7,17 @@ configer:
   -
     name: scnict-mongo
     value: mongodb://root:scnictzzz_x@scnict-mongo:27017/nict?authSource=admin
-    devValue: mongodb://root:scnictzzz_x@127.0.0.1:17017/nict?authSource=admin
+    devValue: mongodb://root:scnictzzz_x@182.150.114.199:17017/nict?authSource=admin
   
-  -
-    name: scnict-user-mongo
-    value: mongodb://root:scnictzzz_x@scnict-mongo:27017/user?authSource=admin
-    devValue: mongodb://root:scnictzzz_x@127.0.0.1:17017/user?authSource=admin
+  # -
+  #   name: scnict-user-mongo
+  #   value: mongodb://root:scnictzzz_x@scnict-mongo:27017/user?authSource=admin
+  #   devValue: mongodb://root:scnictzzz_x@182.150.114.199:17017/user?authSource=admin
 
-  -
-    name: scnict-redis
-    value: scnict-redis:6379#0#default#scnictzzz_x
-    devValue: 127.0.0.1:16379#0#default#scnictzzz_x
+  # -
+  #   name: scnict-redis
+  #   value: scnict-redis:6379#0#default#scnictzzz_x
+  #   devValue: 182.150.114.199:16379#0#default#scnictzzz_x
 
 # adapter:
 #   -

pack-scnict/docker-compose.yaml

@@ -31,19 +31,19 @@ services:
 
     depends_on:
       - scnict-mongo
-      - scnict-redis
+      # - scnict-redis
     ports:
       - 14222:4222
 
   #redis缓存
-  scnict-redis:
-    image: "redis:alpine"
-    restart: always
-    command:
-      --requirepass "scnictzzz_x" #这一行是设置密码
-    privileged: true
-    ports:
-      - 16379:6379
+  # scnict-redis:
+  #   image: "redis:alpine"
+  #   restart: always
+  #   command:
+  #     --requirepass "scnictzzz_x" #这一行是设置密码
+  #   privileged: true
+  #   ports:
+  #     - 16379:6379
 
   scnict-mongo:
     image: mongo:4.4.1
@@ -54,25 +54,25 @@ services:
     volumes:
       - ~/web/data/mongo/db:/data/db
       - ~/web/data/mongo/log:/var/log/mongodb
-      - ~/web/nict:/root/nict
+      # - ~/web/nict:/root/nict
     ports: 
       - 17017:27017
 
-  scnict-user:
-    image: registry.cn-chengdu.aliyuncs.com/infish/pack-comm-usercenter:v1.0.1
-    restart: always
-    depends_on:
-      - scnict-bus
-    environment: 
-      NATS: nats://scnict-bus:4222
-      CONFIGER_MONGO: scnict-user-mongo
-      CONFIGER_REDIS: scnict-redis
-      CONFIGER_JWT: scnict#scnict_zzzzxxx#168
-      IGNORE_USERTYPE: "true"
-      # MONGO_MIGRATIONS: /data/migrations==mongodb://root:3dshow@3dshow-mongo-alpha:27017/supply-user?authSource=admin&&/data/migrations==mongodb://user:password@host:port/dbname?query
-      MONGO_MIGRATIONS: /data/migrations==mongodb://root:scnictzzz_x@scnict-mongo:27017/user?authSource=admin
-    volumes:
-      - ./mongo-migrations:/data/migrations
+  # scnict-user:
+  #   image: registry.cn-chengdu.aliyuncs.com/infish/pack-comm-usercenter:v1.0.1
+  #   restart: always
+  #   depends_on:
+  #     - scnict-bus
+  #   environment: 
+  #     NATS: nats://scnict-bus:4222
+  #     CONFIGER_MONGO: scnict-user-mongo
+  #     CONFIGER_REDIS: scnict-redis
+  #     CONFIGER_JWT: scnict#scnict_zzzzxxx#168
+  #     IGNORE_USERTYPE: "true"
+  #     # MONGO_MIGRATIONS: /data/migrations==mongodb://root:3dshow@3dshow-mongo-alpha:27017/supply-user?authSource=admin&&/data/migrations==mongodb://user:password@host:port/dbname?query
+  #     MONGO_MIGRATIONS: /data/migrations==mongodb://root:scnictzzz_x@scnict-mongo:27017/user?authSource=admin
+  #   volumes:
+  #     - ./mongo-migrations:/data/migrations
 
   scnict:
     image: registry.cn-chengdu.aliyuncs.com/infish/pack-scnict:v1.0.0

scnict.com.conf

@@ -11,8 +11,8 @@ server {
         server_name  www.scnict.com;
         root         /var/www/html;
 
-        ssl_certificate "cert/9659689_www.scnict.com.pem";
-        ssl_certificate_key "cert/9659689_www.scnict.com.key";
+        ssl_certificate "cert/scnict.com.pem";
+        ssl_certificate_key "cert/scnict.com.key";
         ssl_session_cache shared:SSL:1m;
         ssl_session_timeout  10m;
         ssl_ciphers HIGH:!aNULL:!MD5;
@@ -25,15 +25,6 @@ server {
            proxy_pass http://127.0.0.1:7200/;
         }
 	
-	location /download {
-	    alias /root/download;
-	    autoindex on;
-	}
-
-
-	location /apitest/ {
-	   proxy_pass http://127.0.0.1:19000/;
-	}
 
         error_page 404 /404.html;
             location = /40x.html {

scnict/src/Dockerfile

@@ -5,7 +5,7 @@ RUN mkdir -p /root/web
 
 WORKDIR /root/web
 
-ADD ./assets ./assets
+# ADD ./assets ./assets
 ADD ./app.yaml ./app.yaml
 ADD ./scnict ./scnict
 

scnict/src/api/api.go

@@ -9,13 +9,12 @@ import (
 
 	"github.com/gin-contrib/cors"
 	"github.com/gin-gonic/gin"
-	"github.com/go-redis/redis/v8"
 )
 
 type Service struct {
-	Gin            *gin.Engine
-	Mongo          *db.MongoDB
-	Redis          *redis.Client
+	Gin   *gin.Engine
+	Mongo *db.MongoDB
+	// Redis          *redis.Client
 	Port           int32
 	DebugUserId    string
 	DebugUserPhone string
@@ -40,7 +39,8 @@ func (api *ApiSession) CreateRepoCtx() *repo.RepoSession {
 	}
 }
 
-func NewHttpService(app *conf.AppConf, dbMongo *db.MongoDB, redisClient *redis.Client) *Service {
+// func NewHttpService(app *conf.AppConf, dbMongo *db.MongoDB, redisClient *redis.Client) *Service {
+func NewHttpService(app *conf.AppConf, dbMongo *db.MongoDB) *Service {
 
 	engine := gin.Default()
 
@@ -55,7 +55,8 @@ func NewHttpService(app *conf.AppConf, dbMongo *db.MongoDB, redisClient *redis.C
 
 	jwt := NewUitlsJwt(app)
 
-	s := &Service{Conf: app, Redis: redisClient, JWT: jwt, Gin: engine, Mongo: dbMongo, Port: app.Port, DebugUserId: app.Debug.UserId, DebugUserPhone: app.Debug.UserPhone, DebugUserRole: app.Debug.UserRole}
+	// s := &Service{Conf: app, Redis: redisClient, JWT: jwt, Gin: engine, Mongo: dbMongo, Port: app.Port, DebugUserId: app.Debug.UserId, DebugUserPhone: app.Debug.UserPhone, DebugUserRole: app.Debug.UserRole}
+	s := &Service{Conf: app, JWT: jwt, Gin: engine, Mongo: dbMongo, Port: app.Port, DebugUserId: app.Debug.UserId, DebugUserPhone: app.Debug.UserPhone, DebugUserRole: app.Debug.UserRole}
 
 	RegRouters(s)
 

scnict/src/api/nict.go

@@ -17,7 +17,7 @@ func CreateNictRouter(router *GinRouter) {
 
 	// dir test/aaa
 	// file xxx.png
-	router.POSTJWT("/upload", func(c *gin.Context, apictx *ApiSession) (interface{}, error) {
+	router.POST("/upload", func(c *gin.Context, apictx *ApiSession) (interface{}, error) {
 		dir := c.PostForm("dir")
 		file, err := c.FormFile("file")
 		if err != nil {

scnict/src/api/tmp

@@ -1,27 +0,0 @@
-/user/login/password
-
-{
-  "phone": "15871230137",
-  "password": "qaz123456",
-  "key": "scnict"
-}
-
-/user/register
-
-
-{
-    "phone": "15871230137",
-    "code": "343324",
-    "password": "qaz123456",
-    "regInfo": {
-      "key": "scnict"
-    }
-  }
-
-/user/sms
-
-{
-    "phone": "15871230137",
-    "use": "register"
-  }
-

scnict/src/main.go

@@ -22,7 +22,7 @@ func BuildApp() *dig.Container {
 	})
 
 	_ = app.Provide(db.NewMongoDB)
-	_ = app.Provide(db.NewRedisClient)
+	// _ = app.Provide(db.NewRedisClient)
 	_ = app.Provide(bus.NewNatsBus)
 
 	_ = app.Provide(api.NewHttpService)