Merge branch 'master' of ssh://10.10.14.176:222/bigdata/dsMin
continuous-integration/drone/push Build is passing Details

master
kgdxpr 4 years ago
commit 7253a31d92

@ -0,0 +1,38 @@
kind: pipeline
type: docker
name: default
platform:
arch: amd64
os: linux
steps:
- name: build_golang
image: golang:1.16.4-buster
commands:
- export SRC=$DRONE_WORKSPACE
- chmod 755 $SRC/docker/docker-compose.build.sh
- $SRC/docker/docker-compose.build.sh
- echo ${DRONE_STAGE_OS}-${DRONE_STAGE_ARCH}-${DRONE_REPO_BRANCH}-${DRONE_COMMIT_SHA:0:8}>version
# - name: deploy
# image: appleboy/drone-scp:linux-amd64
# settings:
# host: 10.10.14.176
# port: 22
# username: root
# password: dsideal
# target: /root/publish/bigdata
# source: ./docker
# rm: false
# - name: restart
# image: appleboy/drone-ssh:linux-amd64
# settings:
# host: 10.10.14.176
# port: 22
# username: root
# password: dsideal
# script:
# - cd /root/publish/bigdata/docker
# - chmod 755 start.sh
# - chmod 755 stop.sh
# - ./start.sh

4
.gitignore vendored

@ -43,4 +43,6 @@
/dsSupport/WinBuild/
/dsSupport/Logs/
/dsSdsf/.idea/
/dsSdsf/.idea/
*.log

@ -0,0 +1,7 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="2345" type="GoRemoteDebugConfigurationType" factoryName="Go Remote">
<option name="disconnectOption" value="STOP" />
<disconnect value="STOP" />
<method v="2" />
</configuration>
</component>

@ -0,0 +1,6 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="2346" type="GoRemoteDebugConfigurationType" factoryName="Go Remote" port="2346">
<option name="disconnectOption" value="ASK" />
<method v="2" />
</configuration>
</component>

@ -0,0 +1,6 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="2347" type="GoRemoteDebugConfigurationType" factoryName="Go Remote" port="2347">
<option name="disconnectOption" value="ASK" />
<method v="2" />
</configuration>
</component>

@ -0,0 +1,6 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="2348" type="GoRemoteDebugConfigurationType" factoryName="Go Remote" port="2348">
<option name="disconnectOption" value="ASK" />
<method v="2" />
</configuration>
</component>

@ -0,0 +1,6 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="2349" type="GoRemoteDebugConfigurationType" factoryName="Go Remote" port="2349">
<option name="disconnectOption" value="ASK" />
<method v="2" />
</configuration>
</component>

@ -0,0 +1,19 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="docker: Compose dev" type="docker-deploy" factoryName="docker-compose.yml" server-name="Docker">
<deployment type="docker-compose.yml">
<settings>
<option name="envFilePath" value="" />
<option name="commandLineOptions" value="--build" />
<option name="secondarySourceFiles">
<list>
<option value="docker/docker-compose.dev.yml" />
</list>
</option>
<option name="sourceFilePath" value="docker/docker-compose.yml" />
<option name="upExitCodeFromService" value="" />
<option name="upTimeout" value="" />
</settings>
</deployment>
<method v="2" />
</configuration>
</component>

@ -0,0 +1,38 @@
DATA=../data
LOG=../log
TZ=Asia/Shanghai
# IP
IP=10.10.14.179
# windows:DOCKER_SOCK=//var/run/docker.sock
DOCKER_SOCK=/var/run/docker.sock
# PORTAINER
PORTAINER_PORT=9000
PORTAINER_DATA=${DATA}/portainer
# REDIS
REDIS_PORT=18890
REDIS_DATA=${DATA}/redis
# MYSQL
MYSQL_PORT=22066
MYSQL_ROOT_PASSWORD=DsideaL147258369
MYSQL_DATA=${DATA}/mariadb
# NGINX
NGINX_HTTP_PORT=80
NGINX_SSL_PORT=443
NGINX_LOG=${LOG}/openresty
# ELASTICSEARCH
ELASTICSEARCH_DATA=${DATA}/elasticsearch
# KAFKA
KAFKA_DATA=${DATA}/kafka
KAFKA_LOG=${LOG}/kafka
# GREENPLUM
GREENPLUM_DATA=${DATA}/greenplum
GREENPLUM_LOG=${LOG}/greenplum

5
docker/.gitignore vendored

@ -0,0 +1,5 @@
tmp
log
data
app
.env

@ -0,0 +1,23 @@
FROM golang:1.16.5-buster as build
RUN go env -w GOPROXY=https://goproxy.cn
RUN go get github.com/go-delve/delve/cmd/dlv
ARG MODULE
ADD . /go/src/$MODULE
WORKDIR /go/src/$MODULE
RUN go build -gcflags "all=-N -l" -o /example main.go
FROM debian:buster-20210511 as Final
WORKDIR /app
COPY --from=build /go/bin/dlv /
COPY --from=build /example .
COPY *Config ./Config
COPY *Xml ./Xml
COPY *Sql ./Sql
COPY *docs ./docs
COPY *Shell ./
CMD /dlv --headless --listen=:2345 --api-version=2 --accept-multiclient exec /app/example

@ -0,0 +1 @@
docker-compose -f docker-compose.build.yml up

@ -0,0 +1 @@
docker-compose -f docker-compose.build.yml up

@ -0,0 +1,22 @@
process.roles=broker,controller
node.id=1
controller.quorum.voters=1@localhost:9093
listeners=PLAINTEXT://:9092,CONTROLLER://:9093
inter.broker.listener.name=PLAINTEXT
advertised.listeners=PLAINTEXT://kafka:9092
controller.listener.names=CONTROLLER
listener.security.protocol.map=CONTROLLER:PLAINTEXT,PLAINTEXT:PLAINTEXT,SSL:SSL,SASL_PLAINTEXT:SASL_PLAINTEXT,SASL_SSL:SASL_SSL
num.network.threads=3
num.io.threads=8
socket.send.buffer.bytes=102400
socket.receive.buffer.bytes=102400
socket.request.max.bytes=104857600
log.dirs=/tmp/kraft-combined-logs
num.partitions=1
num.recovery.threads.per.data.dir=1
offsets.topic.replication.factor=1
transaction.state.log.replication.factor=1
transaction.state.log.min.isr=1
log.retention.hours=168
log.segment.bytes=1073741824
log.retention.check.interval.ms=300000

@ -0,0 +1,4 @@
CREATE DATABASE exampledb;
CREATE USER 'slave'@'%' IDENTIFIED BY 'aA123456!';
GRANT SELECT, RELOAD, SHOW DATABASES, REPLICATION SLAVE, REPLICATION CLIENT ON *.* TO 'slave'@'%';
FLUSH PRIVILEGES;

@ -0,0 +1,37 @@
[client]
# The MySQL server
[mysqld]
skip-external-locking
skip-name-resolve
back_log = 50
max_connections = 2048
max_connect_errors = 1000
table_open_cache = 1024
open_files_limit = 16384
max_allowed_packet = 16M
read_buffer_size = 8M
read_rnd_buffer_size = 32M
sort_buffer_size = 2M
join_buffer_size = 2M
thread_cache_size = 64
query_cache_size = 64M
query_cache_limit = 4M
slow_query_log = 1
long_query_time = 2
lower_case_table_names = 1
innodb_file_per_table = 1
max_allowed_packet = 1G
server-id = 1
log-bin = mysql-bin
expire_logs_days = 7
binlog_format = ROW
innodb_data_file_path = ibdata1:12M:autoextend
innodb_buffer_pool_size = 2G
innodb_write_io_threads = 12
innodb_read_io_threads = 8
innodb_flush_log_at_trx_commit = 2
innodb_log_buffer_size = 16M
innodb_log_file_size = 170M
innodb_lock_wait_timeout = 60

@ -0,0 +1,68 @@
#user nobody;
worker_processes 8;
#error_log logs/error.log;
#error_log logs/error.log notice;
#error_log logs/error.log info;
#pid logs/nginx.pid;
events {
worker_connections 1024;
}
http {
include mime.types;
default_type text/html;
#log_format main '$remote_addr - $remote_user [$time_local] "$request" '
# '$status $body_bytes_sent "$http_referer" '
# '"$http_user_agent" "$http_x_forwarded_for"';
#access_log logs/access.log main;
sendfile on;
#tcp_nopush on;
#keepalive_timeout 0;
keepalive_timeout 65;
#init_by_lua_file lua/lua_script/init.lua;
gzip_static on;
gzip on;
gzip_min_length 1k;
gzip_buffers 4 16k;
gzip_comp_level 4;
gzip_types text/plain text/css application/javascript application/x-javascript text/xml application/xml text/javascript application/json;
gzip_http_version 1.1;
gzip_disable "MSIE [1-6].";
gzip_vary on;
server {
listen 80;
server_name localhost;
charset utf-8;
#access_log logs/host.access.log main;
# location /sdsf/addInfo {
# content_by_lua_file /usr/local/openresty/nginx/lua/lua_script/addInfo.lua;
# }
# location ~ /sdsf/.*\.(html|css|js|eot|svg|ttf|woff)$ {
# root /usr/local/openresty/nginx/html/;
# expires -1d;
# }
error_page 500 502 503 504 /50x.html;
location = /50x.html {
root html;
}
}
}

@ -0,0 +1,440 @@
-- Copyright (C) by Zhu Dejiang (doujiang24)
-- Copyright (C) by Zexuan Luo (spacewander)
local bit = require "bit"
local band = bit.band
local ffi = require "ffi"
local ffi_new = ffi.new
local ffi_gc = ffi.gc
local ffi_copy = ffi.copy
local ffi_str = ffi.string
local C = ffi.C
local tab_concat = table.concat
local setmetatable = setmetatable
local _M = { _VERSION = '0.05-dev' }
local mt = { __index = _M }
local PADDING = {
RSA_PKCS1_PADDING = 1, -- RSA_size - 11
RSA_SSLV23_PADDING = 2, -- RSA_size - 11
RSA_NO_PADDING = 3, -- RSA_size
RSA_PKCS1_OAEP_PADDING = 4, -- RSA_size - 42
}
_M.PADDING = PADDING
local KEY_TYPE = {
PKCS1 = "PKCS#1",
PKCS8 = "PKCS#8",
}
_M.KEY_TYPE = KEY_TYPE
ffi.cdef[[
typedef struct bio_st BIO;
typedef struct bio_method_st BIO_METHOD;
BIO_METHOD *BIO_s_mem(void);
BIO * BIO_new(BIO_METHOD *type);
int BIO_puts(BIO *bp, const char *buf);
void BIO_vfree(BIO *a);
typedef struct rsa_st RSA;
RSA *RSA_new(void);
void RSA_free(RSA *rsa);
typedef int pem_password_cb(char *buf, int size, int rwflag, void *userdata);
RSA * PEM_read_bio_RSAPrivateKey(BIO *bp, RSA **rsa, pem_password_cb *cb,
void *u);
RSA * PEM_read_bio_RSAPublicKey(BIO *bp, RSA **rsa, pem_password_cb *cb,
void *u);
RSA * PEM_read_bio_RSA_PUBKEY(BIO *bp, RSA **rsa, pem_password_cb *cb,
void *u);
unsigned long ERR_get_error_line_data(const char **file, int *line,
const char **data, int *flags);
const char * ERR_reason_error_string(unsigned long e);
typedef struct bignum_st BIGNUM;
BIGNUM *BN_new(void);
void BN_free(BIGNUM *a);
typedef unsigned long BN_ULONG;
int BN_set_word(BIGNUM *a, BN_ULONG w);
typedef struct bn_gencb_st BN_GENCB;
int RSA_generate_key_ex(RSA *rsa, int bits, BIGNUM *e, BN_GENCB *cb);
typedef struct evp_cipher_st EVP_CIPHER;
int PEM_write_bio_RSAPrivateKey(BIO *bp, RSA *x, const EVP_CIPHER *enc,
unsigned char *kstr, int klen,
pem_password_cb *cb, void *u);
int PEM_write_bio_RSAPublicKey(BIO *bp, RSA *x);
int PEM_write_bio_RSA_PUBKEY(BIO *bp, RSA *x);
long BIO_ctrl(BIO *bp, int cmd, long larg, void *parg);
int BIO_read(BIO *b, void *data, int len);
typedef struct evp_pkey_st EVP_PKEY;
typedef struct engine_st ENGINE;
typedef struct evp_pkey_ctx_st EVP_PKEY_CTX;
EVP_PKEY *EVP_PKEY_new(void);
void EVP_PKEY_free(EVP_PKEY *key);
EVP_PKEY_CTX *EVP_PKEY_CTX_new(EVP_PKEY *pkey, ENGINE *e);
void EVP_PKEY_CTX_free(EVP_PKEY_CTX *ctx);
int EVP_PKEY_CTX_ctrl(EVP_PKEY_CTX *ctx, int keytype, int optype,
int cmd, int p1, void *p2);
int EVP_PKEY_size(EVP_PKEY *pkey);
int EVP_PKEY_encrypt_init(EVP_PKEY_CTX *ctx);
int EVP_PKEY_encrypt(EVP_PKEY_CTX *ctx,
unsigned char *out, size_t *outlen,
const unsigned char *in, size_t inlen);
int EVP_PKEY_decrypt_init(EVP_PKEY_CTX *ctx);
int EVP_PKEY_decrypt(EVP_PKEY_CTX *ctx,
unsigned char *out, size_t *outlen,
const unsigned char *in, size_t inlen);
int EVP_PKEY_set1_RSA(EVP_PKEY *pkey, RSA *key);
int PEM_write_bio_PKCS8PrivateKey(BIO *bp, EVP_PKEY *x, const EVP_CIPHER *enc,
char *kstr, int klen, pem_password_cb *cb,
void *u);
void OpenSSL_add_all_digests(void);
typedef struct env_md_st EVP_MD;
typedef struct env_md_ctx_st EVP_MD_CTX;
const EVP_MD *EVP_get_digestbyname(const char *name);
/* EVP_MD_CTX methods for OpenSSL < 1.1.0 */
EVP_MD_CTX *EVP_MD_CTX_create(void);
void EVP_MD_CTX_destroy(EVP_MD_CTX *ctx);
/* EVP_MD_CTX methods for OpenSSL >= 1.1.0 */
EVP_MD_CTX *EVP_MD_CTX_new(void);
void EVP_MD_CTX_free(EVP_MD_CTX *ctx);
int EVP_DigestInit(EVP_MD_CTX *ctx, const EVP_MD *type);
int EVP_DigestUpdate(EVP_MD_CTX *ctx, const unsigned char *in, int inl);
int EVP_SignFinal(EVP_MD_CTX *ctx,unsigned char *sig,unsigned int *s,
EVP_PKEY *pkey);
int EVP_VerifyFinal(EVP_MD_CTX *ctx,unsigned char *sigbuf, unsigned int siglen,
EVP_PKEY *pkey);
int EVP_PKEY_set1_RSA(EVP_PKEY *e, RSA *r);
void ERR_set_error_data(char *data, int flags);
]]
--[[
# define EVP_PKEY_CTX_set_rsa_padding(ctx, pad) \
EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_RSA, -1, EVP_PKEY_CTRL_RSA_PADDING, \
pad, NULL)
# define EVP_SignInit(a,b) EVP_DigestInit(a,b)
# define EVP_SignUpdate(a,b,c) EVP_DigestUpdate(a,b,c)
--]]
local EVP_PKEY_ALG_CTRL = 0x1000
local EVP_PKEY_CTRL_RSA_PADDING = EVP_PKEY_ALG_CTRL + 1
local NID_rsaEncryption = 6
local EVP_PKEY_RSA = NID_rsaEncryption
local ERR_TXT_STRING = 0x02
local evp_md_ctx_new
local evp_md_ctx_free
if not pcall(function () return C.EVP_MD_CTX_create end) then
evp_md_ctx_new = C.EVP_MD_CTX_new
evp_md_ctx_free = C.EVP_MD_CTX_free
else
evp_md_ctx_new = C.EVP_MD_CTX_create
evp_md_ctx_free = C.EVP_MD_CTX_destroy
end
local function ssl_err()
local err_queue = {}
local i = 1
local data = ffi_new("const char*[1]")
local flags = ffi_new("int[1]")
while true do
local code = C.ERR_get_error_line_data(nil, nil, data, flags)
if code == 0 then
break
end
local err = C.ERR_reason_error_string(code)
err_queue[i] = ffi_str(err)
i = i + 1
if data[0] ~= nil and band(flags[0], ERR_TXT_STRING) > 0 then
err_queue[i] = ffi_str(data[0])
i = i + 1
end
end
return nil, tab_concat(err_queue, ": ", 1, i - 1)
end
local function read_bio(bio)
local BIO_CTRL_PENDING = 10
local keylen = C.BIO_ctrl(bio, BIO_CTRL_PENDING, 0, nil);
local key = ffi.new("char[?]", keylen)
if C.BIO_read(bio, key, keylen) < 0 then
return ssl_err()
end
return ffi_str(key, keylen)
end
-- Follow the calling style to avoid careless mistake.
function _M.generate_rsa_keys(_, bits, pkcs8)
local rsa = C.RSA_new()
ffi_gc(rsa, C.RSA_free)
local bn = C.BN_new()
ffi_gc(bn, C.BN_free)
-- Set public exponent to 65537
if C.BN_set_word(bn, 65537) ~= 1 then
return nil, ssl_err()
end
-- Generate key
if C.RSA_generate_key_ex(rsa, bits, bn, nil) ~= 1 then
return nil, ssl_err()
end
local pub_key_bio = C.BIO_new(C.BIO_s_mem())
ffi_gc(pub_key_bio, C.BIO_vfree)
if pkcs8 == true then
if C.PEM_write_bio_RSA_PUBKEY(pub_key_bio, rsa) ~= 1 then
return nil, ssl_err()
end
else
if C.PEM_write_bio_RSAPublicKey(pub_key_bio, rsa) ~= 1 then
return nil, ssl_err()
end
end
local public_key, err = read_bio(pub_key_bio)
if not public_key then
return nil, nil, err
end
local priv_key_bio = C.BIO_new(C.BIO_s_mem())
ffi_gc(priv_key_bio, C.BIO_vfree)
if pkcs8 == true then
local pk = C.EVP_PKEY_new()
ffi_gc(pk, C.EVP_PKEY_free)
if C.EVP_PKEY_set1_RSA(pk,rsa) ~= 1 then
return nil, ssl_err()
end
if C.PEM_write_bio_PKCS8PrivateKey(priv_key_bio, pk,
nil, nil, 0, nil, nil) ~= 1 then
return nil, ssl_err()
end
else
if C.PEM_write_bio_RSAPrivateKey(priv_key_bio, rsa,
nil, nil, 0, nil, nil) ~= 1 then
return nil, ssl_err()
end
end
local private_key
private_key, err = read_bio(priv_key_bio)
if not private_key then
return nil, nil, err
end
return public_key, private_key
end
function _M.new(_, opts)
local key, read_func, is_pub, md
if opts.public_key then
key = opts.public_key
if opts.key_type == KEY_TYPE.PKCS8 then
read_func = C.PEM_read_bio_RSA_PUBKEY
else
read_func = C.PEM_read_bio_RSAPublicKey
end
is_pub = true
elseif opts.private_key then
key = opts.private_key
read_func = C.PEM_read_bio_RSAPrivateKey
else
return nil, "public_key or private_key not found"
end
local bio_method = C.BIO_s_mem()
local bio = C.BIO_new(bio_method)
ffi_gc(bio, C.BIO_vfree)
local len = C.BIO_puts(bio, key)
if len < 0 then
return ssl_err()
end
local pass
if opts.password then
local plen = #opts.password
pass = ffi_new("unsigned char[?]", plen + 1)
ffi_copy(pass, opts.password, plen)
end
local rsa = read_func(bio, nil, nil, pass)
if rsa == nil then
return ssl_err()
end
ffi_gc(rsa, C.RSA_free)
-- EVP_PKEY
local pkey = C.EVP_PKEY_new()
ffi_gc(pkey, C.EVP_PKEY_free)
if C.EVP_PKEY_set1_RSA(pkey, rsa) == 0 then
return ssl_err()
end
--EVP_PKEY_CTX
local ctx = C.EVP_PKEY_CTX_new(pkey, nil)
if ctx == nil then
return ssl_err()
end
ffi_gc(ctx, C.EVP_PKEY_CTX_free)
-- md_ctx init for sign or verify; if signature algorithm is seted
if opts.algorithm then
md = C.EVP_get_digestbyname(opts.algorithm)
if md == nil then
return nil, "Unknown message digest"
end
end
-- ctx init for encrypt or decrypt
-- default for encrypt/decrypt if nothing is set
if opts.padding or not opts.digest then
local init_func = is_pub and C.EVP_PKEY_encrypt_init
or C.EVP_PKEY_decrypt_init
if init_func(ctx) <= 0 then
return ssl_err()
end
if C.EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_RSA, -1, EVP_PKEY_CTRL_RSA_PADDING,
opts.padding or PADDING.RSA_PKCS1_PADDING, nil) <= 0 then
return ssl_err()
end
end
local size = C.EVP_PKEY_size(pkey)
return setmetatable({
pkey = pkey,
size = size,
buf = ffi_new("unsigned char[?]", size),
_encrypt_ctx = is_pub and ctx or nil,
_decrypt_ctx = not is_pub and ctx or nil,
is_pub = is_pub,
md = md,
}, mt)
end
function _M.decrypt(self, str)
local ctx = self._decrypt_ctx
if not ctx then
return nil, "not inited for decrypt"
end
local len = ffi_new("size_t [1]")
if C.EVP_PKEY_decrypt(ctx, nil, len, str, #str) <= 0 then
return ssl_err()
end
local buf = self.buf
if C.EVP_PKEY_decrypt(ctx, buf, len, str, #str) <= 0 then
return ssl_err()
end
return ffi_str(buf, len[0])
end
function _M.encrypt(self, str)
local ctx = self._encrypt_ctx
if not ctx then
return nil, "not inited for encrypt"
end
local len = ffi_new("size_t [1]")
if C.EVP_PKEY_encrypt(ctx, nil, len, str, #str) <= 0 then
return ssl_err()
end
local buf = self.buf
if C.EVP_PKEY_encrypt(ctx, buf, len, str, #str) <= 0 then
return ssl_err()
end
return ffi_str(buf, len[0])
end
function _M.sign(self, str)
if self.is_pub then
return nil, "not inited for sign"
end
local md_ctx = evp_md_ctx_new()
ffi_gc(md_ctx, evp_md_ctx_free)
if C.EVP_DigestInit(md_ctx, self.md) <= 0 then
return ssl_err()
end
if C.EVP_DigestUpdate(md_ctx, str, #str) <= 0 then
return ssl_err()
end
local buf = self.buf
local len = ffi_new("unsigned int[1]")
if C.EVP_SignFinal(md_ctx, self.buf, len, self.pkey) <= 0 then
return ssl_err()
end
return ffi_str(buf, len[0])
end
function _M.verify(self, str, sig)
if not self.is_pub then
return nil, "not inited for verify"
end
local md_ctx = evp_md_ctx_new()
ffi_gc(md_ctx, evp_md_ctx_free)
if C.EVP_DigestInit(md_ctx, self.md) <= 0 then
return ssl_err()
end
if C.EVP_DigestUpdate(md_ctx, str, #str) <= 0 then
return ssl_err()
end
local siglen = #sig
local buf = siglen <= self.size and self.buf
or ffi_new("unsigned char[?]", siglen)
ffi_copy(buf, sig, siglen)
if C.EVP_VerifyFinal(md_ctx, buf, siglen, self.pkey) <= 0 then
return ssl_err()
end
return true
end
return _M

File diff suppressed because it is too large Load Diff

@ -0,0 +1,47 @@
go env -w GOPROXY=https://goproxy.cn
rm -rf $SRC/docker/app
mkdir -p $SRC/docker/app
# dsBaseRpc
cd $SRC/dsBaseRpc
go build -gcflags "all=-N -l" -o ./build/dsBaseRpc main.go
cp -r ./Shell ./build
cp -r ./Config ./build/Config
#cp -r ./Xml ./build/Xml
cp -r ./Sql ./build/Sql
mv -f ./build ../docker/app/dsBaseRpc
# dsBaseWeb
cd $SRC/dsBaseWeb
go build -gcflags "all=-N -l" -o ./build/dsBaseWeb main.go
cp -r ./Shell ./build
cp -r ./docs ./build/docs
cp -r ./Config ./build/Config
#cp -r ./Xml ./build/Xml
mv -f ./build ../docker/app/dsBaseWeb
# dsBigData
cd $SRC/dsBigData
go build -o ./build/dsBigData main.go
cp -r ./Shell ./build
cp -r ./Config ./build/Config
#cp -r ./Xml ./build/Xml
mv -f ./build ../docker/app/dsBigData
# dsSso
cd $SRC/dsSso
go build -gcflags "all=-N -l" -o ./build/dsSso main.go
cp -r ./Shell ./build
cp -r ./docs ./build/docs
cp -r ./Config ./build/Config
#cp -r ./Xml ./build/Xml
mv -f ./build ../docker/app/dsSso
# dsSupport
cd $SRC/dsSupport
go build -gcflags "all=-N -l" -o ./build/dsSupport main.go
cp -r ./Shell ./build
cp -r ./docs ./build/docs
cp -r ./Config ./build/Config
mv -f ./build ../docker/app/dsSupport

@ -0,0 +1,9 @@
version: "3.8"
services:
build:
image: golang:1.16.5-buster
volumes:
- ../:/go/src
environment:
- SRC=/go/src
command: bash -c "$${SRC}/docker/docker-compose.build.sh"

@ -0,0 +1,79 @@
version: "3.8"
services:
dsbaserpc:
security_opt:
- seccomp:unconfined
cap_add:
- SYS_PTRACE
build:
context: ../dsBaseRpc
dockerfile: ../docker/Dockerfile.dev
args:
- MODULE=dsBaseRpc
ports:
- 8001:8001
- 2345:2345
volumes:
- ../dsBaseRpc/Config/Config.docker.ini:/app/Config/Config.ini
dsbaseweb:
cap_add:
- SYS_PTRACE
security_opt:
- seccomp:unconfined
build:
context: ../dsBaseWeb
dockerfile: ../docker/Dockerfile.dev
args:
- MODULE=dsBaseWeb
ports:
- 8002:8002
- 2346:2345
volumes:
- ../dsBaseWeb/Config/Config.docker.ini:/app/Config/Config.ini
dsbigdata:
cap_add:
- SYS_PTRACE
security_opt:
- seccomp:unconfined
build:
context: ../dsBigData
dockerfile: ../docker/Dockerfile.dev
args:
- MODULE=dsBigData
ports:
- 8004:8004
- 2347:2345
volumes:
- ../dsBigData/Config/Config.docker.ini:/app/Config/Config.ini
dssso:
cap_add:
- SYS_PTRACE
security_opt:
- seccomp:unconfined
build:
context: ../dsSso
dockerfile: ../docker/Dockerfile.dev
args:
- MODULE=dsSso
ports:
- 8000:8000
- 2348:2345
volumes:
- ../dsSso/Config/Config.docker.ini:/app/Config/Config.ini
# dssupport:
# cap_add:
# - SYS_PTRACE
# security_opt:
# - seccomp:unconfined
# build:
# context: ../dsSupport
# dockerfile: ../docker/Dockerfile.dev
# args:
# - MODULE=dsSupport
# ports:
# - 8005:8005
# - 2349:2345
# volumes:
# - ../dsSupport/Config/Config.docker.ini:/app/Config/Config.ini
# depends_on:
# - elasticsearch

@ -0,0 +1,60 @@
version: "3.8"
services:
dsbaserpc:
image: debian:buster-20210511
restart: always
ports:
- 8001:8001
volumes:
- ./app/dsBaseRpc:/app
- ./app/dsBaseRpc/Config/Config.docker.ini:/app/Config/Config.ini
working_dir: /app
command: bash -c "./dsBaseRpc"
dsbaseweb:
image: debian:buster-20210511
restart: always
ports:
- 8002:8002
volumes:
- ./app/dsBaseWeb:/app
- ./app/dsBaseWeb/Config/Config.docker.ini:/app/Config/Config.ini
working_dir: /app
command: bash -c "./dsBaseWeb"
depends_on:
- kafka
dsbigdata:
image: debian:buster-20210511
restart: always
ports:
- 8004:8004
volumes:
- ./app/dsBigData:/app
- ./app/dsBigData/Config/Config.docker.ini:/app/Config/Config.ini
working_dir: /app
command: bash -c "./dsBigData"
depends_on:
- elasticsearch
dssso:
image: debian:buster-20210511
restart: always
ports:
- 8000:8000
volumes:
- ./app/dsSso:/app
- ./app/dsSso/Config/Config.docker.ini:/app/Config/Config.ini
working_dir: /app
command: bash -c "./dsSso"
depends_on:
- kafka
dssupport:
image: debian:buster-20210511
restart: always
ports:
- 8005:8005
volumes:
- ./app/dsSupport:/app
- ./app/dsSupport/Config/Config.docker.ini:/app/Config/Config.ini
working_dir: /app
command: bash -c "./dsSupport"
depends_on:
- elasticsearch

@ -0,0 +1,93 @@
version: "3.8"
services:
portainer:
image: portainer/portainer:1.24.2
restart: always
ports:
- ${PORTAINER_PORT}:9000
volumes:
- ${DOCKER_SOCK}:/var/run/docker.sock
- ${PORTAINER_DATA}:/data
redis:
image: redis:6.2.4-alpine3.13
restart: always
environment:
- TZ=${TZ}
ports:
- ${REDIS_PORT}:6379
volumes:
- ./conf/redis/redis.conf:/usr/local/etc/redis/redis.conf
- ${REDIS_DATA}:/data
mariadb:
image: mariadb:10.5.10
restart: always
environment:
- TZ=${TZ}
- MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD}
command: --default-authentication-plugin=mysql_native_password
ports:
- ${MYSQL_PORT}:3306
volumes:
- ./conf/mariadb/my.cnf:/etc/mysql/conf.d/my.cnf:ro
- ./conf/mariadb/initdb.d:/docker-entrypoint-initdb.d
- ${MYSQL_DATA}:/var/lib/mysql
healthcheck:
test: ["CMD", "mysqladmin", "ping", "-h", "localhost"]
interval: 10s
timeout: 10s
retries: 10
openresty:
image: openresty/openresty:1.19.3.1-8-alpine
restart: always
ports:
- ${NGINX_HTTP_PORT}:80
- ${NGINX_SSL_PORT}:443
volumes:
- ./conf/openresty/nginx.conf:/usr/local/openresty/nginx/conf/nginx.conf
- ./conf/openresty/rsa.lua:/usr/local/openresty/lualib/rsa.lua
- ${NGINX_LOG}:/usr/local/openresty/nginx/logs
kafka:
image: 76527413/kafka:2.8.0
restart: always
volumes:
- ./conf/kafka/server.properties:/opt/kafka/config/kraft/server.properties
- ${KAFKA_DATA}:/tmp/kraft-combined-logs
- ${KAFKA_LOG}:/opt/kafka/logs
ports:
- 9092:9092
- 9093:9093
healthcheck:
test: ["CMD", "nc", "-vz", "localhost", "9092"]
interval: 10s
timeout: 10s
retries: 10
elasticsearch:
image: elasticsearch:7.12.0
healthcheck:
test: ["CMD", "nc", "-vz", "localhost", "9200"]
interval: 10s
timeout: 10s
retries: 10
restart: always
environment:
- ES_JAVA_OPTS=-Xms512m -Xmx512m
- discovery.type=single-node
- http.cors.enabled=true
- http.cors.allow-origin=*
ports:
- 9200:9200
- 9300:9300
volumes:
#chmod 777 elasticsearch
- ${ELASTICSEARCH_DATA}:/usr/share/elasticsearch/data
# greenplum:
# image: 76527413/greenplum:6.16.2
# restart: always
# hostname: greenplum_singlenode
# environment:
# - DATABASE=exampledb
# ports:
# - 5432:5432
# volumes:
# - ${GREENPLUM_DATA}:/data
# - ${GREENPLUM_LOG}:/home/gpadmin/gpAdminLogs

@ -0,0 +1 @@
docker-compose --compatibility -f docker-compose.yml -f docker-compose.pro.yml up --remove-orphans -d

@ -0,0 +1 @@
docker-compose --compatibility -f docker-compose.yml -f docker-compose.dev.yml up --remove-orphans -d

@ -0,0 +1 @@
docker-compose --compatibility -f docker-compose.yml -f docker-compose.pro.yml up --remove-orphans -d

@ -0,0 +1 @@
docker-compose down --remove-orphans

@ -0,0 +1 @@
docker-compose down --remove-orphans

@ -0,0 +1,37 @@
[mysql] # mysql的配置项
ip = mariadb
port = 3306
database = base_db_dev
user = root
pwd = DsideaL147258369
[distribute] #发布功能的配置
ip = server.dsmin.com
port = 22
user = root
pwd = dsideal
remotePath = /usr/local/dsMin/dsBaseRpc/
localPath = E:\Work\dsMin\dsBaseRpc\build
[redis]
ip = redis
port = 6379
db = 0
expireTime = 86400
# 注册rpc server
[rpcServer]
port = 8001
# 本项目名称,用于记录日志
[project]
project_name = dsBaseRpc
# 数据汇集的地址
[dataExchange]
#host = http://10.10.14.186:9009
host = http://10.10.14.213:9009
exchangeUrl = /v1/dataex/DataexSet
SystemAuthUrl = /v1/dataex/SystemAuth
SystemId = BASE_GO
SystemKey = 96fa57b8-ac44-11ea-bd48-f48e38f73cf7

@ -0,0 +1,67 @@
[distribute] #发布功能的配置
ip = 10.10.14.187
port = 22
user = root
pwd = dsideal
remotePath = /usr/local/dsMin/dsBaseWeb/
localPath = E:/Work/dsMin/dsBaseWeb
[mysql]
ip = mariadb
port = 3306
db_name = base_db_dev
[redis]
ip = redis
port = 6379
db = 0
expireTime = 86400
# 注册rpc server
[rpcServer]
ip = dsbaserpc
port = 8001
#gin服务器的端口
[server]
port = 8002
# 本项目名称,用于记录日志
[project]
project_name = dsBaseWeb
[kafka]
brokers = kafka:9092
partition = 20
replication = 1
KafkaAccessLogTopic = log_baseweb
[sso]
ssoServerNw = http://10.10.14.187
#ssoServerNw = http://10.10.24.116:8000
ssoServerWw = http://fort.edusoa.com:7777
authCodeURI = /oauth2/authorize
authTokenURI = /oauth2/access_token
authLogoutURI = /oauth2/logout
clientIdNw = br888ra563ugbm2ov77g
clientSecretNw = 01e9f8ak57e3j03vrjq34zg6ws
#clientIdNw = bu3pcf7cl45ug8dup8og
#clientSecretNw = 01emmt5qdyszh9ndbpbg4zk4tn
clientIdWw = bpomac2563uj213q1g2g
clientSecretWw = 01e3nf6hnr2eysdxhc2n80w9ca
responseType = code
grantType = authorization_code
redirectURINw = http://10.10.14.187/base/sso/CheckSsoCode
#redirectURINw = http://127.0.0.1:8002/base/sso/CheckSsoCode
redirectURIWw = http://fort.edusoa.com:7777/base/sso/CheckSsoCode
accessTokenKey = ds_access_token
[deleteXlsx]
#删除7天前无用的模板文件
diffTime = 7
# 内部IP段起始
[IP]
intranetIP=192,172,10,127

@ -7,8 +7,8 @@ remotePath = /usr/local/dsMin/dsBigData/
localPath = E:/Work/dsMin/dsBigData
[redis]
ip = 127.0.0.1
port = 18890
ip = redis
port = 6379
db = 0
expireTime = 86400
@ -21,4 +21,4 @@ port = 8004
project_name = dsBigData
[elasticsearch]
url = http://10.10.14.212:9200
url = http://elasticsearch:9200

@ -1,7 +0,0 @@
.ico
.html
.css
.jpg
.jpeg
.png
/base/sso/CheckSsoCode

@ -1,12 +0,0 @@
_ ____ _ _____ _
| | | _ \(_) | __ \ | |
__| |___| |_) |_ __ _| | | | __ _| |_ __ _
/ _` / __| _ <| |/ _` | | | |/ _` | __/ _` |
| (_| \__ \ |_) | | (_| | |__| | (_| | || (_| |
\__,_|___/____/|_|\__, |_____/ \__,_|\__\__,_|
__/ |
|___/
Created By HuangHai 2020-01-20
http://patorjk.com/software/taag/#p=display&f=Big&t=dsBigData

@ -1,10 +0,0 @@
#!/bin/bash
# 杀掉进程
kill -9 `pgrep -f dsBigData` 2>/dev/null
sleep 3
cd /usr/local/dsMin/dsBigData
chmod +x dsBigData
# 运行为后台进程
/usr/local/dsMin/dsBigData/dsBigData

Binary file not shown.

@ -1,10 +0,0 @@
#!/bin/bash
# 杀掉进程
kill -9 `pgrep -f dsBigData` 2>/dev/null
sleep 3
chmod +x dsBigData
# 运行为后台进程
nohup /usr/local/dsMin/dsBigData/dsBigData >> /usr/local/dsMin/dsBigData/dsBigData.log 2>&1 &

@ -1,4 +0,0 @@
#!/bin/bash
# kill 命令不使用 -9 参数时,会回调 onStop() 方法,确定不需要此回调建议使用 -9 参数
kill -9 `pgrep -f dsBigData` 2>/dev/null

@ -0,0 +1,33 @@
[mysql] # mysql1的配置项
ip = mariadb
port = 3306
database = base_db_dev
user = root
pwd = DsideaL147258369
[distribute] #发布功能的配置
ip = 10.10.14.187
port = 22
user = root
pwd = dsideal
remotePath = /usr/local/dsMin/dsSso/
localPath = E:\Work\dsMin\dsSso\build
[redis]
ip = redis
port = 6379
db = 0
[kafka]
KafkaAddress = kafka:9092
KafkaAccessLogTopic = dsAccessLog
# ----------------------------------------------------------------------------------------------------
[server] #gin服务器的端口
port = 8000
# 验证码的有效时间,单位:秒
CaptchaExpireTime = 120
[install_area]
code = changchun

@ -44,7 +44,11 @@ func init() {
LogUtil.Error(ErrorConst.CreateRedisError, "Redis异常")
} else if err != nil {
LogUtil.Error(ErrorConst.CreateRedisError, err.Error())
}
}
}
func FlushAll() {
RedisClient.FlushAll()
}
//======下面的代码由黄海增加于2020-02-18=============================================================

@ -18,20 +18,20 @@ require (
github.com/fatih/structs v1.1.0 // indirect
github.com/fsnotify/fsnotify v1.4.9 // indirect
github.com/garyburd/redigo v1.6.0
github.com/gin-gonic/gin v1.6.3
github.com/gin-gonic/gin v1.7.2
github.com/go-openapi/spec v0.19.6 // indirect
github.com/go-openapi/swag v0.19.7 // indirect
github.com/go-playground/universal-translator v0.17.0 // indirect
github.com/go-playground/validator/v10 v10.4.1 // indirect
github.com/go-playground/validator/v10 v10.6.1 // indirect
github.com/go-redis/redis/v7 v7.2.0
github.com/go-sql-driver/mysql v1.5.0
github.com/go-xorm/cmd/xorm v0.0.0-20190426080617-f87981e709a1 // indirect
github.com/golang/protobuf v1.4.3 // indirect
github.com/json-iterator/go v1.1.10 // indirect
github.com/golang/protobuf v1.5.2 // indirect
github.com/json-iterator/go v1.1.11 // indirect
github.com/klauspost/compress v1.10.2 // indirect
github.com/konsorten/go-windows-terminal-sequences v1.0.2 // indirect
github.com/leodido/go-urn v1.2.1 // indirect
github.com/mattn/go-isatty v0.0.12 // indirect
github.com/mattn/go-isatty v0.0.13 // indirect
github.com/mattn/go-sqlite3 v1.10.0 // indirect
github.com/oklog/ulid v1.3.1
github.com/pborman/uuid v1.2.0 // indirect
@ -48,15 +48,15 @@ require (
github.com/tidwall/gjson v1.6.0
github.com/tidwall/pretty v1.0.1 // indirect
github.com/tracer0tong/kafkalogrus v0.0.0-20180816014403-290bb4d4d549
github.com/ugorji/go v1.2.3 // indirect
github.com/ugorji/go v1.2.6 // indirect
github.com/xormplus/builder v0.0.0-20200331055651-240ff40009be // indirect
github.com/xormplus/core v0.0.0-20200308074340-f3bce19d5f31
github.com/xormplus/xorm v0.0.0-20200529061552-7d0d26c6f81c
golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad
golang.org/x/net v0.0.0-20200301022130-244492dfa37a // indirect
golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c // indirect
golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e
golang.org/x/sys v0.0.0-20210616094352-59db8d763f22 // indirect
golang.org/x/text v0.3.6 // indirect
golang.org/x/tools v0.0.0-20200213050514-49b8ac185c84 // indirect
google.golang.org/protobuf v1.25.0 // indirect
google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013 // indirect
gopkg.in/flosch/pongo2.v3 v3.0.0-20141028000813-5e81b817a0c4 // indirect
gopkg.in/go-playground/validator.v9 v9.31.0 // indirect
gopkg.in/ini.v1 v1.42.0

@ -93,6 +93,8 @@ github.com/gin-gonic/gin v1.5.0 h1:fi+bqFAx/oLK54somfCtEZs9HeH1LHVoEPUgARpTqyc=
github.com/gin-gonic/gin v1.5.0/go.mod h1:Nd6IXA8m5kNZdNEHMBd93KT+mdY3+bewLgRvmCsR2Do=
github.com/gin-gonic/gin v1.6.3 h1:ahKqKTFpO5KTPHxWZjEdPScmYaGtLo8Y4DMHoEsnp14=
github.com/gin-gonic/gin v1.6.3/go.mod h1:75u5sXoLsGZoRN5Sgbi1eraJ4GU3++wFwWzhwvtwp4M=
github.com/gin-gonic/gin v1.7.2 h1:Tg03T9yM2xa8j6I3Z3oqLaQRSmKvxPd6g/2HJ6zICFA=
github.com/gin-gonic/gin v1.7.2/go.mod h1:jD2toBW3GZUr5UMcdrwQA10I7RuaFOl/SGeDjXkfUtY=
github.com/gliderlabs/ssh v0.1.1/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aevW3Awn0=
github.com/go-openapi/jsonpointer v0.17.0/go.mod h1:cOnomiV+CVVwFLk0A/MExoFMjwdsUdVpsRhURCKh+3M=
github.com/go-openapi/jsonpointer v0.19.2/go.mod h1:3akKfEdA7DF1sugOqz1dVQHBcuDBPKZGEoHC/NkiQRg=
@ -125,6 +127,8 @@ github.com/go-playground/validator/v10 v10.2.0 h1:KgJ0snyC2R9VXYN2rneOtQcw5aHQB1
github.com/go-playground/validator/v10 v10.2.0/go.mod h1:uOYAAleCW8F/7oMFd6aG0GOhaH6EGOAJShg8Id5JGkI=
github.com/go-playground/validator/v10 v10.4.1 h1:pH2c5ADXtd66mxoE0Zm9SUhxE20r7aM3F26W0hOn+GE=
github.com/go-playground/validator/v10 v10.4.1/go.mod h1:nlOn6nFhuKACm19sB/8EGNn9GlaMV7XkbRSipzJ0Ii4=
github.com/go-playground/validator/v10 v10.6.1 h1:W6TRDXt4WcWp4c4nf/G+6BkGdhiIo0k417gfr+V6u4I=
github.com/go-playground/validator/v10 v10.6.1/go.mod h1:xm76BBt941f7yWdGnI2DVPFFg1UK3YY04qifoXU3lOk=
github.com/go-redis/redis/v7 v7.2.0 h1:CrCexy/jYWZjW0AyVoHlcJUeZN19VWlbepTh1Vq6dJs=
github.com/go-redis/redis/v7 v7.2.0/go.mod h1:JDNMw23GTyLNC4GZu9njt15ctBQVn7xjRfnwdHj/Dcg=
github.com/go-sql-driver/mysql v0.0.0-20180719071942-99ff426eb706/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w=
@ -161,6 +165,9 @@ github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvq
github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8=
github.com/golang/protobuf v1.4.3 h1:JjCZWpVbqXDqFVmTfYWEVTMIYrL/NPdPSCHPJ0T/raM=
github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw=
github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
github.com/golang/snappy v0.0.1 h1:Qgr9rKW7uDUkrbSmQeiDsGa8SjGyCOGtuasMWwvp2P4=
github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
@ -171,6 +178,7 @@ github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMyw
github.com/google/go-cmp v0.4.0 h1:xsAVV57WRhGj6kEIi8ReJzQlHHqcBYCElAvkovg3B/4=
github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
github.com/google/go-github v17.0.0+incompatible/go.mod h1:zLgOLi98H3fifZn+44m+umXrS52loVEgC2AApnigrVQ=
github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck=
github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
@ -201,6 +209,8 @@ github.com/json-iterator/go v1.1.9 h1:9yzud/Ht36ygwatGx56VwCZtlI/2AD15T1X2sjSuGn
github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
github.com/json-iterator/go v1.1.10 h1:Kz6Cvnvv2wGdaG/V8yMvfkmNiXq9Ya2KUv4rouJJr68=
github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
github.com/json-iterator/go v1.1.11 h1:uVUAXhF2To8cbw/3xN3pxj6kk7TYKs98NIrTqPlMWAQ=
github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo=
github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
@ -244,6 +254,8 @@ github.com/mattn/go-isatty v0.0.9 h1:d5US/mDsogSGW37IV293h//ZFaeajb69h+EHFsv2xGg
github.com/mattn/go-isatty v0.0.9/go.mod h1:YNRxwqDuOph6SZLI9vUUz6OYw3QyUt7WiY2yME+cCiQ=
github.com/mattn/go-isatty v0.0.12 h1:wuysRhFDzyxgEmMf5xjvJ2M9dZoWAXNNr5LSBS7uHXY=
github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
github.com/mattn/go-isatty v0.0.13 h1:qdl+GuBjcsKKDco5BsxPJlId98mSWNKqYA+Co0SC1yA=
github.com/mattn/go-isatty v0.0.13/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
github.com/mattn/go-sqlite3 v1.9.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc=
github.com/mattn/go-sqlite3 v1.10.0 h1:jbhqpg7tQe4SupckyijYiy0mJJ/pRyHvXf7JdWK860o=
github.com/mattn/go-sqlite3 v1.10.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc=
@ -362,12 +374,16 @@ github.com/ugorji/go v1.1.7 h1:/68gy2h+1mWMrwZFeD1kQialdSzAb432dtpeJ42ovdo=
github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVMw=
github.com/ugorji/go v1.2.3 h1:WbFSXLxDFKVN69Sk8t+XHGzVCD7R8UoAATR8NqZgTbk=
github.com/ugorji/go v1.2.3/go.mod h1:5l8GZ8hZvmL4uMdy+mhCO1LjswGRYco9Q3HfuisB21A=
github.com/ugorji/go v1.2.6 h1:tGiWC9HENWE2tqYycIqFTNorMmFRVhNwCpDOpWqnk8E=
github.com/ugorji/go v1.2.6/go.mod h1:anCg0y61KIhDlPZmnH+so+RQbysYVyDko0IMgJv0Nn0=
github.com/ugorji/go/codec v0.0.0-20181022190402-e5e69e061d4f/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0=
github.com/ugorji/go/codec v1.1.5-pre/go.mod h1:tULtS6Gy1AE1yCENaw4Vb//HLH5njI2tfCQDUqRd8fI=
github.com/ugorji/go/codec v1.1.7 h1:2SvQaVZ1ouYrrKKwoSk2pzd4A9evlKJb9oTL+OaLUSs=
github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY=
github.com/ugorji/go/codec v1.2.3 h1:/mVYEV+Jo3IZKeA5gBngN0AvNnQltEDkR+eQikkWQu0=
github.com/ugorji/go/codec v1.2.3/go.mod h1:5FxzDJIgeiWJZslYHPj+LS1dq1ZBQVelZFnjsFGI/Uc=
github.com/ugorji/go/codec v1.2.6 h1:7kbGefxLoDBuYXOms4yD7223OpNMMPNPZxXk5TvFcyQ=
github.com/ugorji/go/codec v1.2.6/go.mod h1:V6TCNZ4PHqoHGFZuSG1W8nrCzzdgA2DozYxWFFpvxTw=
github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA=
github.com/urfave/cli v1.22.2/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0=
github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c/go.mod h1:lB8K/P019DLNhemzwFU4jHLhdvlE6uDZjXFejJXr49I=
@ -397,6 +413,8 @@ golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 h1:psW17arqaxU48Z5kZ0CQnk
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad h1:DN0cp81fZ3njFcrLCytUHRSUkqBjfTo4Tx9RJTWs0EY=
golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I=
golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e h1:gsTQYXdTw2Gq7RBsWvlQ91b+aEQ6bXFUngBGuR8sPpI=
golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
golang.org/x/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
@ -424,6 +442,7 @@ golang.org/x/net v0.0.0-20200202094626-16171245cfb2 h1:CCH4IOTTfewWjGOlSp+zGcjut
golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/net v0.0.0-20200301022130-244492dfa37a h1:GuSPYbZzB5/dcLNCwLQLsg3obCJtX9IJhpXkvY7kzk0=
golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
golang.org/x/oauth2 v0.0.0-20181017192945-9dcd33a902f4/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
golang.org/x/oauth2 v0.0.0-20181203162652-d668ce993890/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
@ -451,13 +470,21 @@ golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7w
golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae h1:Ih9Yo4hSPImZOpfGuA4bR/ORKTAbhZo2AbWNRCnevdo=
golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c h1:VwygUrnw9jn88c4u8GD3rZQbqrP/tgas88tPUbBxQrk=
golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20210616094352-59db8d763f22 h1:RqytpXGR1iVNX7psjB3ff8y7sNFinVFvkx1c8SjBkio=
golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs=
golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/text v0.3.6 h1:aRYxNxv6iGQlyVaZmk6ZgYEDa+Jg18DxebPSrd6bg1M=
golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
@ -507,6 +534,9 @@ google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2
google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
google.golang.org/protobuf v1.25.0 h1:Ejskq+SyPohKW+1uil0JJMtmHCgJPJ/qWTxr8qp+R4c=
google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
google.golang.org/protobuf v1.26.0 h1:bxAC2xTBsZGibn2RTntX0oH50xLsqy1OxA9tTL3p/lk=
google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo=

@ -27,6 +27,9 @@ import (
2020-03-25
*/
func startOAuth2Server() {
//清空Redis
RedisUtil.FlushAll()
//声明OAuth2的Redis存储器
RedisStorage.OAuth2RedisStorage = &RedisStorage.RedisStorage{
Pool: RedisUtil.Pool,

@ -0,0 +1,56 @@
[distribute] #发布功能的配置
ip = 10.10.14.187
port = 22
user = root
pwd = dsideal
remotePath = /usr/local/dsMin/dsSupport/
localPath = E:/Work/dsMin/dsSupport
[mysql]
;ip = 10.10.6.200
;port = 22066
;database = base_db_zhangjun
;user = root
;pwd = DsideaL147258369
ip = mariadb
port = 3306
database = base_db_dev
user = root
pwd = DsideaL147258369
[redis]
;ip = 127.0.0.1
;port = 6379
;db = 1
;expireTime = 86400
ip = redis
port = 6379
db = 1
expireTime = 86400
#gin服务器的端口
[server]
port = 8005
[elasticsearch]
;nodes = http://10.10.14.188:9200
##nodes = http://10.10.14.61:9200,http://10.10.14.62:9200,http://10.10.14.63:9200
##nodes = http://192.168.0.200:9200,http://192.168.0.200:9201,http://192.168.0.200:9202
nodes = http://elasticsearch:9200
;http://10.10.14.188:9200,
;nodes = http://192.168.0.200:9200,http://192.168.0.200:9201,http://192.168.0.200:9202
;user = root
;pwd = dsideal
# 本项目名称,用于记录日志
[project]
project_name = dsSupport
[rpcServer]
ip = 127.0.0.1
port = 8001
# 后台登陆账号密码
[account]
users = admin:dsideal,administrator:dsideal123@321,datams:data123
Loading…
Cancel
Save