();
+ gct = null;
+ lct = null;
+ }
+
+ /**
+ * Reads a single byte from the input stream.
+ */
+ protected int read() {
+ int curByte = 0;
+ try {
+ curByte = in.read();
+ } catch (IOException e) {
+ status = STATUS_FORMAT_ERROR;
+ }
+ return curByte;
+ }
+
+ /**
+ * Reads next variable length block from input.
+ *
+ * @return number of bytes stored in "buffer"
+ */
+ protected int readBlock() {
+ blockSize = read();
+ int n = 0;
+ if (blockSize > 0) {
+ try {
+ int count = 0;
+ while (n < blockSize) {
+ count = in.read(block, n, blockSize - n);
+ if (count == -1)
+ break;
+ n += count;
+ }
+ } catch (IOException ignored) {
+ }
+
+ if (n < blockSize) {
+ status = STATUS_FORMAT_ERROR;
+ }
+ }
+ return n;
+ }
+
+ /**
+ * Reads color table as 256 RGB integer values
+ *
+ * @param ncolors int number of colors to read
+ * @return int array containing 256 colors (packed ARGB with full alpha)
+ */
+ protected int[] readColorTable(int ncolors) {
+ int nbytes = 3 * ncolors;
+ int[] tab = null;
+ byte[] c = new byte[nbytes];
+ int n = 0;
+ try {
+ n = in.read(c);
+ } catch (IOException ignored) {
+ }
+ if (n < nbytes) {
+ status = STATUS_FORMAT_ERROR;
+ } else {
+ tab = new int[256]; // max size to avoid bounds checks
+ int i = 0;
+ int j = 0;
+ while (i < ncolors) {
+ int r = ((int) c[j++]) & 0xff;
+ int g = ((int) c[j++]) & 0xff;
+ int b = ((int) c[j++]) & 0xff;
+ tab[i++] = 0xff000000 | (r << 16) | (g << 8) | b;
+ }
+ }
+ return tab;
+ }
+
+ /**
+ * Main file parser. Reads GIF content blocks.
+ */
+ protected void readContents() {
+ // read GIF file content blocks
+ boolean done = false;
+ while (!(done || err())) {
+ int code = read();
+ switch (code) {
+
+ case 0x2C: // image separator
+ readImage();
+ break;
+
+ case 0x21: // extension
+ code = read();
+ switch (code) {
+ case 0xf9: // graphics control extension
+ readGraphicControlExt();
+ break;
+
+ case 0xff: // application extension
+ readBlock();
+ String app = "";
+ for (int i = 0; i < 11; i++) {
+ app += (char) block[i];
+ }
+ if (app.equals("NETSCAPE2.0")) {
+ readNetscapeExt();
+ } else
+ skip(); // don't care
+ break;
+
+ default: // uninteresting extension
+ skip();
+ }
+ break;
+
+ case 0x3b: // terminator
+ done = true;
+ break;
+
+ case 0x00: // bad byte, but keep going and see what happens
+ break;
+
+ default:
+ status = STATUS_FORMAT_ERROR;
+ }
+ }
+ }
+
+ /**
+ * Reads Graphics Control Extension values
+ */
+ protected void readGraphicControlExt() {
+ read(); // block size
+ int packed = read(); // packed fields
+ dispose = (packed & 0x1c) >> 2; // disposal method
+ if (dispose == 0) {
+ dispose = 1; // elect to keep old image if discretionary
+ }
+ transparency = (packed & 1) != 0;
+ delay = readShort() * 10; // delay in milliseconds
+ transIndex = read(); // transparent color index
+ read(); // block terminator
+ }
+
+ /**
+ * Reads GIF file header information.
+ */
+ protected void readHeader() {
+ String id = "";
+ for (int i = 0; i < 6; i++) {
+ id += (char) read();
+ }
+ if (!id.startsWith("GIF")) {
+ status = STATUS_FORMAT_ERROR;
+ return;
+ }
+
+ readLSD();
+ if (gctFlag && !err()) {
+ gct = readColorTable(gctSize);
+ bgColor = gct[bgIndex];
+ }
+ }
+
+ /**
+ * Reads next frame image
+ */
+ protected void readImage() {
+ ix = readShort(); // (sub)image position & size
+ iy = readShort();
+ iw = readShort();
+ ih = readShort();
+
+ int packed = read();
+ lctFlag = (packed & 0x80) != 0; // 1 - local color table flag
+ interlace = (packed & 0x40) != 0; // 2 - interlace flag
+ // 3 - sort flag
+ // 4-5 - reserved
+ lctSize = 2 << (packed & 7); // 6-8 - local color table size
+
+ if (lctFlag) {
+ lct = readColorTable(lctSize); // read table
+ act = lct; // make local table active
+ } else {
+ act = gct; // make global table active
+ if (bgIndex == transIndex)
+ bgColor = 0;
+ }
+ int save = 0;
+ if (transparency) {
+ save = act[transIndex];
+ act[transIndex] = 0; // set transparent color if specified
+ }
+
+ if (act == null) {
+ status = STATUS_FORMAT_ERROR; // no color table defined
+ }
+
+ if (err()) return;
+
+ decodeImageData(); // decode pixel data
+ skip();
+
+ if (err()) return;
+
+ frameCount++;
+
+ // create new image to receive frame data
+ image =
+ new BufferedImage(width, height, BufferedImage.TYPE_INT_ARGB_PRE);
+
+ setPixels(); // transfer pixel data to image
+
+ frames.add(new GifFrame(image, delay)); // add image to frame list
+
+ if (transparency) {
+ act[transIndex] = save;
+ }
+ resetFrame();
+
+ }
+
+ /**
+ * Reads Logical Screen Descriptor
+ */
+ protected void readLSD() {
+
+ // logical screen size
+ width = readShort();
+ height = readShort();
+
+ // packed fields
+ int packed = read();
+ gctFlag = (packed & 0x80) != 0; // 1 : global color table flag
+ // 2-4 : color resolution
+ // 5 : gct sort flag
+ gctSize = 2 << (packed & 7); // 6-8 : gct size
+
+ bgIndex = read(); // background color index
+ pixelAspect = read(); // pixel aspect ratio
+ }
+
+ /**
+ * Reads Netscape extenstion to obtain iteration count
+ */
+ protected void readNetscapeExt() {
+ do {
+ readBlock();
+ if (block[0] == 1) {
+ // loop count sub-block
+ int b1 = ((int) block[1]) & 0xff;
+ int b2 = ((int) block[2]) & 0xff;
+ loopCount = (b2 << 8) | b1;
+ }
+ } while ((blockSize > 0) && !err());
+ }
+
+ /**
+ * Reads next 16-bit value, LSB first
+ */
+ protected int readShort() {
+ // read 16-bit value, LSB first
+ return read() | (read() << 8);
+ }
+
+ /**
+ * Resets frame state for reading next image.
+ */
+ protected void resetFrame() {
+ lastDispose = dispose;
+ lastRect = new Rectangle(ix, iy, iw, ih);
+ lastImage = image;
+ lastBgColor = bgColor;
+ int dispose = 0;
+ boolean transparency = false;
+ int delay = 0;
+ lct = null;
+ }
+
+ /**
+ * Skips variable length blocks up to and including
+ * next zero length block.
+ */
+ protected void skip() {
+ do {
+ readBlock();
+ } while ((blockSize > 0) && !err());
+ }
+}
diff --git a/basic-util/src/main/java/ink/wgink/util/gif/GifEncoder.java b/basic-util/src/main/java/ink/wgink/util/gif/GifEncoder.java
new file mode 100644
index 00000000..2e9eb7f4
--- /dev/null
+++ b/basic-util/src/main/java/ink/wgink/util/gif/GifEncoder.java
@@ -0,0 +1,489 @@
+package ink.wgink.util.gif;
+
+import java.awt.*;
+import java.awt.image.BufferedImage;
+import java.awt.image.DataBufferByte;
+import java.io.BufferedOutputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+
+/**
+ * Class AnimatedGifEncoder - Encodes a GIF file consisting of one or
+ * more frames.
+ *
+ * Example:
+ * AnimatedGifEncoder e = new AnimatedGifEncoder();
+ * e.start(outputFileName);
+ * e.setDelay(1000); // 1 frame per sec
+ * e.addFrame(image1);
+ * e.addFrame(image2);
+ * e.finish();
+ *
+ * No copyright asserted on the source code of this class. May be used
+ * for any purpose, however, refer to the Unisys LZW patent for restrictions
+ * on use of the associated Encoder class. Please forward any corrections
+ * to questions at fmsware.com.
+ *
+ * @author wuhongjun
+ * @version 1.03 November 2003
+ */
+public class GifEncoder {
+ protected int width; // image size
+ protected int height;
+ protected Color transparent = null; // transparent color if given
+ protected int transIndex; // transparent index in color table
+ protected int repeat = -1; // no repeat
+ protected int delay = 0; // frame delay (hundredths)
+ protected boolean started = false; // ready to output frames
+ protected OutputStream out;
+ protected BufferedImage image; // current frame
+ protected byte[] pixels; // BGR byte array from frame
+ protected byte[] indexedPixels; // converted frame indexed to palette
+ protected int colorDepth; // number of bit planes
+ protected byte[] colorTab; // RGB palette
+ protected boolean[] usedEntry = new boolean[256]; // active palette entries
+ protected int palSize = 7; // color table size (bits-1)
+ protected int dispose = -1; // disposal code (-1 = use default)
+ protected boolean closeStream = false; // close stream when finished
+ protected boolean firstFrame = true;
+ protected boolean sizeSet = false; // if false, get size from first frame
+ protected int sample = 10; // default sample interval for quantizer
+
+ /**
+ * Sets the delay time between each frame, or changes it
+ * for subsequent frames (applies to last frame added).
+ *
+ * @param ms int delay time in milliseconds
+ */
+ public void setDelay(int ms) {
+ delay = Math.round(ms / 10.0f);
+ }
+
+ /**
+ * Sets the GIF frame disposal code for the last added frame
+ * and any subsequent frames. Default is 0 if no transparent
+ * color has been set, otherwise 2.
+ *
+ * @param code int disposal code.
+ */
+ public void setDispose(int code) {
+ if (code >= 0) {
+ dispose = code;
+ }
+ }
+
+ /**
+ * Sets the number of times the set of GIF frames
+ * should be played. Default is 1; 0 means play
+ * indefinitely. Must be invoked before the first
+ * image is added.
+ *
+ * @param iter int number of iterations.
+ * @return
+ */
+ public void setRepeat(int iter) {
+ if (iter >= 0) {
+ repeat = iter;
+ }
+ }
+
+ /**
+ * Sets the transparent color for the last added frame
+ * and any subsequent frames.
+ * Since all colors are subject to modification
+ * in the quantization process, the color in the final
+ * palette for each frame closest to the given color
+ * becomes the transparent color for that frame.
+ * May be set to null to indicate no transparent color.
+ *
+ * @param c Color to be treated as transparent on display.
+ */
+ public void setTransparent(Color c) {
+ transparent = c;
+ }
+
+ /**
+ * Adds next GIF frame. The frame is not written immediately, but is
+ * actually deferred until the next frame is received so that timing
+ * data can be inserted. Invoking finish() flushes all
+ * frames. If setSize was not invoked, the size of the
+ * first image is used for all subsequent frames.
+ *
+ * @param im BufferedImage containing frame to write.
+ * @return true if successful.
+ */
+ public boolean addFrame(BufferedImage im) {
+ if ((im == null) || !started) {
+ return false;
+ }
+ boolean ok = true;
+ try {
+ if (!sizeSet) {
+ // use first frame's size
+ setSize(im.getWidth(), im.getHeight());
+ }
+ image = im;
+ getImagePixels(); // convert to correct format if necessary
+ analyzePixels(); // build color table & map pixels
+ if (firstFrame) {
+ writeLSD(); // logical screen descriptior
+ writePalette(); // global color table
+ if (repeat >= 0) {
+ // use NS app extension to indicate reps
+ writeNetscapeExt();
+ }
+ }
+ writeGraphicCtrlExt(); // write graphic control extension
+ writeImageDesc(); // image descriptor
+ if (!firstFrame) {
+ writePalette(); // local color table
+ }
+ writePixels(); // encode and write pixel data
+ firstFrame = false;
+ } catch (IOException e) {
+ ok = false;
+ }
+
+ return ok;
+ }
+
+ //added by alvaro
+ public boolean outFlush() {
+ boolean ok = true;
+ try {
+ out.flush();
+ return ok;
+ } catch (IOException e) {
+ ok = false;
+ }
+
+ return ok;
+ }
+
+ public byte[] getFrameByteArray() {
+ return ((ByteArrayOutputStream) out).toByteArray();
+ }
+
+ /**
+ * Flushes any pending data and closes output file.
+ * If writing to an OutputStream, the stream is not
+ * closed.
+ */
+ public boolean finish() {
+ if (!started) return false;
+ boolean ok = true;
+ started = false;
+ try {
+ out.write(0x3b); // gif trailer
+ out.flush();
+ if (closeStream) {
+ out.close();
+ }
+ } catch (IOException e) {
+ ok = false;
+ }
+
+ return ok;
+ }
+
+ public void reset() {
+ // reset for subsequent use
+ transIndex = 0;
+ out = null;
+ image = null;
+ pixels = null;
+ indexedPixels = null;
+ colorTab = null;
+ closeStream = false;
+ firstFrame = true;
+ }
+
+ /**
+ * Sets frame rate in frames per second. Equivalent to
+ * setDelay(1000/fps).
+ *
+ * @param fps float frame rate (frames per second)
+ */
+ public void setFrameRate(float fps) {
+ if (fps != 0f) {
+ delay = Math.round(100f / fps);
+ }
+ }
+
+ /**
+ * Sets quality of color quantization (conversion of images
+ * to the maximum 256 colors allowed by the GIF specification).
+ * Lower values (minimum = 1) produce better colors, but slow
+ * processing significantly. 10 is the default, and produces
+ * good color mapping at reasonable speeds. Values greater
+ * than 20 do not yield significant improvements in speed.
+ *
+ * @param quality int greater than 0.
+ * @return
+ */
+ public void setQuality(int quality) {
+ if (quality < 1) quality = 1;
+ sample = quality;
+ }
+
+ /**
+ * Sets the GIF frame size. The default size is the
+ * size of the first frame added if this method is
+ * not invoked.
+ *
+ * @param w int frame width.
+ * @param h int frame width.
+ */
+ public void setSize(int w, int h) {
+ if (started && !firstFrame) return;
+ width = w;
+ height = h;
+ if (width < 1) width = 320;
+ if (height < 1) height = 240;
+ sizeSet = true;
+ }
+
+ /**
+ * Initiates GIF file creation on the given stream. The stream
+ * is not closed automatically.
+ *
+ * @param os OutputStream on which GIF images are written.
+ * @return false if initial write failed.
+ */
+ public boolean start(OutputStream os) {
+ if (os == null) return false;
+ boolean ok = true;
+ closeStream = false;
+ out = os;
+ try {
+ writeString("GIF89a"); // header
+ } catch (IOException e) {
+ ok = false;
+ }
+ return started = ok;
+ }
+
+ /**
+ * Initiates writing of a GIF file with the specified name.
+ *
+ * @param file String containing output file name.
+ * @return false if open or initial write failed.
+ */
+ public boolean start(String file) {
+ boolean ok = true;
+ try {
+ out = new BufferedOutputStream(new FileOutputStream(file));
+ ok = start(out);
+ closeStream = true;
+ } catch (IOException e) {
+ ok = false;
+ }
+ return started = ok;
+ }
+
+ /**
+ * Analyzes image colors and creates color map.
+ */
+ protected void analyzePixels() {
+ int len = pixels.length;
+ int nPix = len / 3;
+ indexedPixels = new byte[nPix];
+ Quant nq = new Quant(pixels, len, sample);
+ // initialize quantizer
+ colorTab = nq.process(); // create reduced palette
+ // convert map from BGR to RGB
+ for (int i = 0; i < colorTab.length; i += 3) {
+ byte temp = colorTab[i];
+ colorTab[i] = colorTab[i + 2];
+ colorTab[i + 2] = temp;
+ usedEntry[i / 3] = false;
+ }
+ // map image pixels to new palette
+ int k = 0;
+ for (int i = 0; i < nPix; i++) {
+ int index =
+ nq.map(pixels[k++] & 0xff,
+ pixels[k++] & 0xff,
+ pixels[k++] & 0xff);
+ usedEntry[index] = true;
+ indexedPixels[i] = (byte) index;
+ }
+ pixels = null;
+ colorDepth = 8;
+ palSize = 7;
+ // get closest match to transparent color if specified
+ if (transparent != null) {
+ transIndex = findClosest(transparent);
+ }
+ }
+
+ /**
+ * Returns index of palette color closest to c
+ */
+ protected int findClosest(Color c) {
+ if (colorTab == null) return -1;
+ int r = c.getRed();
+ int g = c.getGreen();
+ int b = c.getBlue();
+ int minpos = 0;
+ int dmin = 256 * 256 * 256;
+ int len = colorTab.length;
+ for (int i = 0; i < len; ) {
+ int dr = r - (colorTab[i++] & 0xff);
+ int dg = g - (colorTab[i++] & 0xff);
+ int db = b - (colorTab[i] & 0xff);
+ int d = dr * dr + dg * dg + db * db;
+ int index = i / 3;
+ if (usedEntry[index] && (d < dmin)) {
+ dmin = d;
+ minpos = index;
+ }
+ i++;
+ }
+ return minpos;
+ }
+
+ /**
+ * Extracts image pixels into byte array "pixels"
+ */
+ protected void getImagePixels() {
+ int w = image.getWidth();
+ int h = image.getHeight();
+ int type = image.getType();
+ if ((w != width)
+ || (h != height)
+ || (type != BufferedImage.TYPE_3BYTE_BGR)) {
+ // create new image with right size/format
+ BufferedImage temp =
+ new BufferedImage(width, height, BufferedImage.TYPE_3BYTE_BGR);
+ Graphics2D g = temp.createGraphics();
+ g.drawImage(image, 0, 0, null);
+ image = temp;
+ }
+ pixels = ((DataBufferByte) image.getRaster().getDataBuffer()).getData();
+ }
+
+ /**
+ * Writes Graphic Control Extension
+ */
+ protected void writeGraphicCtrlExt() throws IOException {
+ out.write(0x21); // extension introducer
+ out.write(0xf9); // GCE label
+ out.write(4); // data block size
+ int transp, disp;
+ if (transparent == null) {
+ transp = 0;
+ disp = 0; // dispose = no action
+ } else {
+ transp = 1;
+ disp = 2; // force clear if using transparent color
+ }
+ if (dispose >= 0) {
+ disp = dispose & 7; // user override
+ }
+ disp <<= 2;
+
+ // packed fields
+ out.write(0 | // 1:3 reserved
+ disp | // 4:6 disposal
+ 0 | // 7 user input - 0 = none
+ transp); // 8 transparency flag
+
+ writeShort(delay); // delay x 1/100 sec
+ out.write(transIndex); // transparent color index
+ out.write(0); // block terminator
+ }
+
+ /**
+ * Writes Image Descriptor
+ */
+ protected void writeImageDesc() throws IOException {
+ out.write(0x2c); // image separator
+ writeShort(0); // image position x,y = 0,0
+ writeShort(0);
+ writeShort(width); // image size
+ writeShort(height);
+ // packed fields
+ if (firstFrame) {
+ // no LCT - GCT is used for first (or only) frame
+ out.write(0);
+ } else {
+ // specify normal LCT
+ out.write(0x80 | // 1 local color table 1=yes
+ 0 | // 2 interlace - 0=no
+ 0 | // 3 sorted - 0=no
+ 0 | // 4-5 reserved
+ palSize); // 6-8 size of color table
+ }
+ }
+
+ /**
+ * Writes Logical Screen Descriptor
+ */
+ protected void writeLSD() throws IOException {
+ // logical screen size
+ writeShort(width);
+ writeShort(height);
+ // packed fields
+ out.write((0x80 | // 1 : global color table flag = 1 (gct used)
+ 0x70 | // 2-4 : color resolution = 7
+ 0x00 | // 5 : gct sort flag = 0
+ palSize)); // 6-8 : gct size
+
+ out.write(0); // background color index
+ out.write(0); // pixel aspect ratio - assume 1:1
+ }
+
+ /**
+ * Writes Netscape application extension to define
+ * repeat count.
+ */
+ protected void writeNetscapeExt() throws IOException {
+ out.write(0x21); // extension introducer
+ out.write(0xff); // app extension label
+ out.write(11); // block size
+ writeString("NETSCAPE" + "2.0"); // app id + auth code
+ out.write(3); // sub-block size
+ out.write(1); // loop sub-block id
+ writeShort(repeat); // loop count (extra iterations, 0=repeat forever)
+ out.write(0); // block terminator
+ }
+
+ /**
+ * Writes color table
+ */
+ protected void writePalette() throws IOException {
+ out.write(colorTab, 0, colorTab.length);
+ int n = (3 * 256) - colorTab.length;
+ for (int i = 0; i < n; i++) {
+ out.write(0);
+ }
+ }
+
+ /**
+ * Encodes and writes pixel data
+ */
+ protected void writePixels() throws IOException {
+ Encoder encoder = new Encoder(width, height, indexedPixels, colorDepth);
+ encoder.encode(out);
+ }
+
+ /**
+ * Write 16-bit value to output stream, LSB first
+ */
+ protected void writeShort(int value) throws IOException {
+ out.write(value & 0xff);
+ out.write((value >> 8) & 0xff);
+ }
+
+ /**
+ * Writes string to output stream
+ */
+ protected void writeString(String s) throws IOException {
+ for (int i = 0; i < s.length(); i++) {
+ out.write((byte) s.charAt(i));
+ }
+ }
+}
diff --git a/basic-util/src/main/java/ink/wgink/util/gif/Quant.java b/basic-util/src/main/java/ink/wgink/util/gif/Quant.java
new file mode 100644
index 00000000..e62affaa
--- /dev/null
+++ b/basic-util/src/main/java/ink/wgink/util/gif/Quant.java
@@ -0,0 +1,443 @@
+package ink.wgink.util.gif;
+
+/**
+ *
+ *
+ * @author: wuhongjun
+ * @version:1.0
+ */
+public class Quant {
+ protected static final int netsize = 256; /* number of colours used */
+
+ /* four primes near 500 - assume no image has a length so large */
+ /* that it is divisible by all four primes */
+ protected static final int prime1 = 499;
+ protected static final int prime2 = 491;
+ protected static final int prime3 = 487;
+ protected static final int prime4 = 503;
+
+ protected static final int minpicturebytes = (3 * prime4);
+ /* minimum size for input image */
+
+ /* Program Skeleton
+ ----------------
+ [select samplefac in range 1..30]
+ [read image from input file]
+ pic = (unsigned char*) malloc(3*width*height);
+ initnet(pic,3*width*height,samplefac);
+ learn();
+ unbiasnet();
+ [write output image header, using writecolourmap(f)]
+ inxbuild();
+ write output image using inxsearch(b,g,r) */
+
+ /* Network Definitions
+ ------------------- */
+
+ protected static final int maxnetpos = (netsize - 1);
+ protected static final int netbiasshift = 4; /* bias for colour values */
+ protected static final int ncycles = 100; /* no. of learning cycles */
+
+ /* defs for freq and bias */
+ protected static final int intbiasshift = 16; /* bias for fractions */
+ protected static final int intbias = (((int) 1) << intbiasshift);
+ protected static final int gammashift = 10; /* gamma = 1024 */
+ protected static final int gamma = (((int) 1) << gammashift);
+ protected static final int betashift = 10;
+ protected static final int beta = (intbias >> betashift); /* beta = 1/1024 */
+ protected static final int betagamma =
+ (intbias << (gammashift - betashift));
+
+ /* defs for decreasing radius factor */
+ protected static final int initrad = (netsize >> 3); /* for 256 cols, radius starts */
+ protected static final int radiusbiasshift = 6; /* at 32.0 biased by 6 bits */
+ protected static final int radiusbias = (((int) 1) << radiusbiasshift);
+ protected static final int initradius = (initrad * radiusbias); /* and decreases by a */
+ protected static final int radiusdec = 30; /* factor of 1/30 each cycle */
+
+ /* defs for decreasing alpha factor */
+ protected static final int alphabiasshift = 10; /* alpha starts at 1.0 */
+ protected static final int initalpha = (((int) 1) << alphabiasshift);
+
+ protected int alphadec; /* biased by 10 bits */
+
+ /* radbias and alpharadbias used for radpower calculation */
+ protected static final int radbiasshift = 8;
+ protected static final int radbias = (((int) 1) << radbiasshift);
+ protected static final int alpharadbshift = (alphabiasshift + radbiasshift);
+ protected static final int alpharadbias = (((int) 1) << alpharadbshift);
+
+ /* Types and Global Variables
+ -------------------------- */
+
+ protected byte[] thepicture; /* the input image itself */
+ protected int lengthcount; /* lengthcount = H*W*3 */
+
+ protected int samplefac; /* sampling factor 1..30 */
+
+ // typedef int pixel[4]; /* BGRc */
+ protected int[][] network; /* the network itself - [netsize][4] */
+
+ protected int[] netindex = new int[256];
+ /* for network lookup - really 256 */
+
+ protected int[] bias = new int[netsize];
+ /* bias and freq arrays for learning */
+ protected int[] freq = new int[netsize];
+ protected int[] radpower = new int[initrad];
+ /* radpower for precomputation */
+
+ /* Initialise network in range (0,0,0) to (255,255,255) and set parameters
+ ----------------------------------------------------------------------- */
+ public Quant(byte[] thepic, int len, int sample) {
+
+ int i;
+ int[] p;
+
+ thepicture = thepic;
+ lengthcount = len;
+ samplefac = sample;
+
+ network = new int[netsize][];
+ for (i = 0; i < netsize; i++) {
+ network[i] = new int[4];
+ p = network[i];
+ p[0] = p[1] = p[2] = (i << (netbiasshift + 8)) / netsize;
+ freq[i] = intbias / netsize; /* 1/netsize */
+ bias[i] = 0;
+ }
+ }
+
+ public byte[] colorMap() {
+ byte[] map = new byte[3 * netsize];
+ int[] index = new int[netsize];
+ for (int i = 0; i < netsize; i++)
+ index[network[i][3]] = i;
+ int k = 0;
+ for (int i = 0; i < netsize; i++) {
+ int j = index[i];
+ map[k++] = (byte) (network[j][0]);
+ map[k++] = (byte) (network[j][1]);
+ map[k++] = (byte) (network[j][2]);
+ }
+ return map;
+ }
+
+ /* Insertion sort of network and building of netindex[0..255] (to do after unbias)
+ ------------------------------------------------------------------------------- */
+ public void inxbuild() {
+
+ int i, j, smallpos, smallval;
+ int[] p;
+ int[] q;
+ int previouscol, startpos;
+
+ previouscol = 0;
+ startpos = 0;
+ for (i = 0; i < netsize; i++) {
+ p = network[i];
+ smallpos = i;
+ smallval = p[1]; /* index on g */
+ /* find smallest in i..netsize-1 */
+ for (j = i + 1; j < netsize; j++) {
+ q = network[j];
+ if (q[1] < smallval) { /* index on g */
+ smallpos = j;
+ smallval = q[1]; /* index on g */
+ }
+ }
+ q = network[smallpos];
+ /* swap p (i) and q (smallpos) entries */
+ if (i != smallpos) {
+ j = q[0];
+ q[0] = p[0];
+ p[0] = j;
+ j = q[1];
+ q[1] = p[1];
+ p[1] = j;
+ j = q[2];
+ q[2] = p[2];
+ p[2] = j;
+ j = q[3];
+ q[3] = p[3];
+ p[3] = j;
+ }
+ /* smallval entry is now in position i */
+ if (smallval != previouscol) {
+ netindex[previouscol] = (startpos + i) >> 1;
+ for (j = previouscol + 1; j < smallval; j++)
+ netindex[j] = i;
+ previouscol = smallval;
+ startpos = i;
+ }
+ }
+ netindex[previouscol] = (startpos + maxnetpos) >> 1;
+ for (j = previouscol + 1; j < 256; j++)
+ netindex[j] = maxnetpos; /* really 256 */
+ }
+
+ /* Main Learning Loop
+ ------------------ */
+ public void learn() {
+
+ int i, j, b, g, r;
+ int radius, rad, alpha, step, delta, samplepixels;
+ byte[] p;
+ int pix, lim;
+
+ if (lengthcount < minpicturebytes)
+ samplefac = 1;
+ alphadec = 30 + ((samplefac - 1) / 3);
+ p = thepicture;
+ pix = 0;
+ lim = lengthcount;
+ samplepixels = lengthcount / (3 * samplefac);
+ delta = samplepixels / ncycles;
+ alpha = initalpha;
+ radius = initradius;
+
+ rad = radius >> radiusbiasshift;
+ if (rad <= 1)
+ rad = 0;
+ for (i = 0; i < rad; i++)
+ radpower[i] =
+ alpha * (((rad * rad - i * i) * radbias) / (rad * rad));
+
+ //fprintf(stderr,"beginning 1D learning: initial radius=%d\n", rad);
+
+ if (lengthcount < minpicturebytes)
+ step = 3;
+ else if ((lengthcount % prime1) != 0)
+ step = 3 * prime1;
+ else {
+ if ((lengthcount % prime2) != 0)
+ step = 3 * prime2;
+ else {
+ if ((lengthcount % prime3) != 0)
+ step = 3 * prime3;
+ else
+ step = 3 * prime4;
+ }
+ }
+
+ i = 0;
+ while (i < samplepixels) {
+ b = (p[pix + 0] & 0xff) << netbiasshift;
+ g = (p[pix + 1] & 0xff) << netbiasshift;
+ r = (p[pix + 2] & 0xff) << netbiasshift;
+ j = contest(b, g, r);
+
+ altersingle(alpha, j, b, g, r);
+ if (rad != 0)
+ alterneigh(rad, j, b, g, r); /* alter neighbours */
+
+ pix += step;
+ if (pix >= lim)
+ pix -= lengthcount;
+
+ i++;
+ if (delta == 0)
+ delta = 1;
+ if (i % delta == 0) {
+ alpha -= alpha / alphadec;
+ radius -= radius / radiusdec;
+ rad = radius >> radiusbiasshift;
+ if (rad <= 1)
+ rad = 0;
+ for (j = 0; j < rad; j++)
+ radpower[j] =
+ alpha * (((rad * rad - j * j) * radbias) / (rad * rad));
+ }
+ }
+ //fprintf(stderr,"finished 1D learning: final alpha=%f !\n",((float)alpha)/initalpha);
+ }
+
+ /* Search for BGR values 0..255 (after net is unbiased) and return colour index
+ ---------------------------------------------------------------------------- */
+ public int map(int b, int g, int r) {
+
+ int i, j, dist, a, bestd;
+ int[] p;
+ int best;
+
+ bestd = 1000; /* biggest possible dist is 256*3 */
+ best = -1;
+ i = netindex[g]; /* index on g */
+ j = i - 1; /* start at netindex[g] and work outwards */
+
+ while ((i < netsize) || (j >= 0)) {
+ if (i < netsize) {
+ p = network[i];
+ dist = p[1] - g; /* inx key */
+ if (dist >= bestd)
+ i = netsize; /* stop iter */
+ else {
+ i++;
+ if (dist < 0)
+ dist = -dist;
+ a = p[0] - b;
+ if (a < 0)
+ a = -a;
+ dist += a;
+ if (dist < bestd) {
+ a = p[2] - r;
+ if (a < 0)
+ a = -a;
+ dist += a;
+ if (dist < bestd) {
+ bestd = dist;
+ best = p[3];
+ }
+ }
+ }
+ }
+ if (j >= 0) {
+ p = network[j];
+ dist = g - p[1]; /* inx key - reverse dif */
+ if (dist >= bestd)
+ j = -1; /* stop iter */
+ else {
+ j--;
+ if (dist < 0)
+ dist = -dist;
+ a = p[0] - b;
+ if (a < 0)
+ a = -a;
+ dist += a;
+ if (dist < bestd) {
+ a = p[2] - r;
+ if (a < 0)
+ a = -a;
+ dist += a;
+ if (dist < bestd) {
+ bestd = dist;
+ best = p[3];
+ }
+ }
+ }
+ }
+ }
+ return (best);
+ }
+
+ public byte[] process() {
+ learn();
+ unbiasnet();
+ inxbuild();
+ return colorMap();
+ }
+
+ /* Unbias network to give byte values 0..255 and record position i to prepare for sort
+ ----------------------------------------------------------------------------------- */
+ public void unbiasnet() {
+
+ int i, j;
+
+ for (i = 0; i < netsize; i++) {
+ network[i][0] >>= netbiasshift;
+ network[i][1] >>= netbiasshift;
+ network[i][2] >>= netbiasshift;
+ network[i][3] = i; /* record colour no */
+ }
+ }
+
+ /* Move adjacent neurons by precomputed alpha*(1-((i-j)^2/[r]^2)) in radpower[|i-j|]
+ --------------------------------------------------------------------------------- */
+ protected void alterneigh(int rad, int i, int b, int g, int r) {
+
+ int j, k, lo, hi, a, m;
+ int[] p;
+
+ lo = i - rad;
+ if (lo < -1)
+ lo = -1;
+ hi = i + rad;
+ if (hi > netsize)
+ hi = netsize;
+
+ j = i + 1;
+ k = i - 1;
+ m = 1;
+ while ((j < hi) || (k > lo)) {
+ a = radpower[m++];
+ if (j < hi) {
+ p = network[j++];
+ try {
+ p[0] -= (a * (p[0] - b)) / alpharadbias;
+ p[1] -= (a * (p[1] - g)) / alpharadbias;
+ p[2] -= (a * (p[2] - r)) / alpharadbias;
+ } catch (Exception e) {
+ } // prevents 1.3 miscompilation
+ }
+ if (k > lo) {
+ p = network[k--];
+ try {
+ p[0] -= (a * (p[0] - b)) / alpharadbias;
+ p[1] -= (a * (p[1] - g)) / alpharadbias;
+ p[2] -= (a * (p[2] - r)) / alpharadbias;
+ } catch (Exception e) {
+ }
+ }
+ }
+ }
+
+ /* Move neuron i towards biased (b,g,r) by factor alpha
+ ---------------------------------------------------- */
+ protected void altersingle(int alpha, int i, int b, int g, int r) {
+
+ /* alter hit neuron */
+ int[] n = network[i];
+ n[0] -= (alpha * (n[0] - b)) / initalpha;
+ n[1] -= (alpha * (n[1] - g)) / initalpha;
+ n[2] -= (alpha * (n[2] - r)) / initalpha;
+ }
+
+ /* Search for biased BGR values
+ ---------------------------- */
+ protected int contest(int b, int g, int r) {
+
+ /* finds closest neuron (min dist) and updates freq */
+ /* finds best neuron (min dist-bias) and returns position */
+ /* for frequently chosen neurons, freq[i] is high and bias[i] is negative */
+ /* bias[i] = gamma*((1/netsize)-freq[i]) */
+
+ int i, dist, a, biasdist, betafreq;
+ int bestpos, bestbiaspos, bestd, bestbiasd;
+ int[] n;
+
+ bestd = ~(((int) 1) << 31);
+ bestbiasd = bestd;
+ bestpos = -1;
+ bestbiaspos = bestpos;
+
+ for (i = 0; i < netsize; i++) {
+ n = network[i];
+ dist = n[0] - b;
+ if (dist < 0)
+ dist = -dist;
+ a = n[1] - g;
+ if (a < 0)
+ a = -a;
+ dist += a;
+ a = n[2] - r;
+ if (a < 0)
+ a = -a;
+ dist += a;
+ if (dist < bestd) {
+ bestd = dist;
+ bestpos = i;
+ }
+ biasdist = dist - ((bias[i]) >> (intbiasshift - netbiasshift));
+ if (biasdist < bestbiasd) {
+ bestbiasd = biasdist;
+ bestbiaspos = i;
+ }
+ betafreq = (freq[i] >> betashift);
+ freq[i] -= betafreq;
+ bias[i] += (betafreq << gammashift);
+ }
+ freq[bestpos] += beta;
+ bias[bestpos] -= betagamma;
+ return (bestbiaspos);
+ }
+}
diff --git a/basic-util/src/main/java/ink/wgink/util/verification/code/Captcha.java b/basic-util/src/main/java/ink/wgink/util/verification/code/Captcha.java
new file mode 100644
index 00000000..33a7017d
--- /dev/null
+++ b/basic-util/src/main/java/ink/wgink/util/verification/code/Captcha.java
@@ -0,0 +1,121 @@
+package ink.wgink.util.verification.code;
+
+import java.awt.*;
+import java.io.OutputStream;
+
+import static ink.wgink.util.verification.code.Randoms.alpha;
+import static ink.wgink.util.verification.code.Randoms.num;
+
+/**
+ * When you feel like quitting. Think about why you started
+ * 当你想要放弃的时候，想想当初你为何开始
+ *
+ * @ClassName: Captcha
+ * @Description: 验证码
+ * @Author: WangGeng
+ * @Date: 2019/9/26 9:13 下午
+ * @Version: 1.0
+ **/
+public abstract class Captcha {
+ /**
+ * 字体
+ */
+ protected Font font = new Font("Verdana", Font.ITALIC | Font.BOLD, 28);
+ /**
+ * 验证码随机字符长度
+ */
+ protected int len = 5;
+ /**
+ * 验证码显示跨度
+ */
+ protected int width = 150;
+ /**
+ * 验证码显示高度
+ */
+ protected int height = 40;
+ /**
+ * 随机字符串
+ */
+ private String chars = null;
+
+ /**
+ * 生成随机字符数组
+ *
+ * @return 字符数组
+ */
+ protected char[] alphas() {
+ char[] cs = new char[len];
+ for (int i = 0; i < len; i++) {
+ cs[i] = alpha();
+ }
+ chars = new String(cs);
+ return cs;
+ }
+
+ public Font getFont() {
+ return font;
+ }
+
+ public void setFont(Font font) {
+ this.font = font;
+ }
+
+ public int getLen() {
+ return len;
+ }
+
+ public void setLen(int len) {
+ this.len = len;
+ }
+
+ public int getWidth() {
+ return width;
+ }
+
+ public void setWidth(int width) {
+ this.width = width;
+ }
+
+ public int getHeight() {
+ return height;
+ }
+
+ public void setHeight(int height) {
+ this.height = height;
+ }
+
+ /**
+ * 给定范围获得随机颜色
+ *
+ * @return Color 随机颜色
+ */
+ protected Color color(int fc, int bc) {
+ if (fc > 255) {
+ fc = 255;
+ }
+ if (bc > 255) {
+ bc = 255;
+ }
+ int r = fc + num(bc - fc);
+ int g = fc + num(bc - fc);
+ int b = fc + num(bc - fc);
+ return new Color(r, g, b);
+ }
+
+ /**
+ * 验证码输出,抽象方法，由子类实现
+ *
+ * @param os 输出流
+ */
+ public abstract void out(OutputStream os);
+
+ /**
+ * 获取随机字符串
+ *
+ * @return string
+ */
+ public String text() {
+ return chars;
+ }
+
+}
diff --git a/basic-util/src/main/java/ink/wgink/util/verification/code/GifCaptcha.java b/basic-util/src/main/java/ink/wgink/util/verification/code/GifCaptcha.java
new file mode 100644
index 00000000..4cfae873
--- /dev/null
+++ b/basic-util/src/main/java/ink/wgink/util/verification/code/GifCaptcha.java
@@ -0,0 +1,113 @@
+package ink.wgink.util.verification.code;
+
+
+import ink.wgink.util.gif.GifEncoder;
+
+import java.awt.*;
+import java.awt.image.BufferedImage;
+import java.io.OutputStream;
+
+import static ink.wgink.util.verification.code.Randoms.num;
+
+/**
+ * When you feel like quitting. Think about why you started
+ * 当你想要放弃的时候，想想当初你为何开始
+ *
+ * @ClassName: GifCaptcha
+ * @Description: 验证码
+ * @Author: WangGeng
+ * @Date: 2019/9/26 9:21 下午
+ * @Version: 1.0
+ **/
+public class GifCaptcha extends Captcha {
+
+ public GifCaptcha() {
+ }
+
+ public GifCaptcha(int width, int height) {
+ this.width = width;
+ this.height = height;
+ }
+
+ public GifCaptcha(int width, int height, int len) {
+ this(width, height);
+ this.len = len;
+ }
+
+ public GifCaptcha(int width, int height, int len, Font font) {
+ this(width, height, len);
+ this.font = font;
+ }
+
+ @Override
+ public void out(OutputStream os) {
+ try {
+ // gif编码类，这个利用了洋人写的编码类，所有类都在附件中
+ GifEncoder gifEncoder = new GifEncoder();
+ //生成字符
+ gifEncoder.start(os);
+ gifEncoder.setQuality(180);
+ gifEncoder.setDelay(100);
+ gifEncoder.setRepeat(0);
+ BufferedImage frame;
+ char[] rands = alphas();
+ Color fontcolor[] = new Color[len];
+ for (int i = 0; i < len; i++) {
+ fontcolor[i] = new Color(20 + num(110), 20 + num(110), 20 + num(110));
+ }
+ for (int i = 0; i < len; i++) {
+ frame = graphicsImage(fontcolor, rands, i);
+ gifEncoder.addFrame(frame);
+ frame.flush();
+ }
+ gifEncoder.finish();
+ } finally {
+ Streams.close(os);
+ }
+
+ }
+
+ /**
+ * 画随机码图
+ *
+ * @param fontcolor 随机字体颜色
+ * @param strs 字符数组
+ * @param flag 透明度使用
+ * @return BufferedImage
+ */
+ private BufferedImage graphicsImage(Color[] fontcolor, char[] strs, int flag) {
+ BufferedImage image = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB);
+ //或得图形上下文
+ //Graphics2D g2d=image.createGraphics();
+ Graphics2D g2d = (Graphics2D) image.getGraphics();
+ //利用指定颜色填充背景
+ g2d.setColor(Color.WHITE);
+ g2d.fillRect(0, 0, width, height);
+ AlphaComposite ac3;
+ int h = height - ((height - font.getSize()) >> 1);
+ int w = width / len;
+ g2d.setFont(font);
+ for (int i = 0; i < len; i++) {
+ ac3 = AlphaComposite.getInstance(AlphaComposite.SRC_OVER, getAlpha(flag, i));
+ g2d.setComposite(ac3);
+ g2d.setColor(fontcolor[i]);
+ g2d.drawOval(num(width), num(height), 5 + num(10), 5 + num(10));
+ g2d.drawString(strs[i] + "", (width - (len - i) * w) + (w - font.getSize()) + 1, h - 4);
+ }
+ g2d.dispose();
+ return image;
+ }
+
+ /**
+ * 获取透明度,从0到1,自动计算步长
+ *
+ * @return float 透明度
+ */
+ private float getAlpha(int i, int j) {
+ int num = i + j;
+ float r = (float) 1 / len, s = (len + 1) * r;
+ return num > len ? (num * r - s) : num * r;
+ }
+
+
+}
diff --git a/basic-util/src/main/java/ink/wgink/util/verification/code/Randoms.java b/basic-util/src/main/java/ink/wgink/util/verification/code/Randoms.java
new file mode 100644
index 00000000..7621d3b7
--- /dev/null
+++ b/basic-util/src/main/java/ink/wgink/util/verification/code/Randoms.java
@@ -0,0 +1,48 @@
+package ink.wgink.util.verification.code;
+
+import java.util.Random;
+
+/**
+ * When you feel like quitting. Think about why you started
+ * 当你想要放弃的时候，想想当初你为何开始
+ *
+ * @ClassName: Randoms
+ * @Description: 随机数
+ * @Author: WangGeng
+ * @Date: 2019/9/26 9:18 下午
+ * @Version: 1.0
+ **/
+public class Randoms {
+
+ private static final Random RANDOM = new Random();
+ /**
+ * 定义验证码字符.去除了O和I等容易混淆的字母
+ */
+ public static final char[] ALPHA = {'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'G', 'K', 'M', 'N', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z'
+ , 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'm', 'n', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', '2', '3', '4', '5', '6', '7', '8', '9'};
+
+ /**
+ * 产生两个数之间的随机数
+ *
+ * @param min 小数
+ * @param max 比min大的数
+ * @return int 随机数字
+ */
+ public static int num(int min, int max) {
+ return min + RANDOM.nextInt(max - min);
+ }
+
+ /**
+ * 产生0--num的随机数,不包括num
+ *
+ * @param num 数字
+ * @return int 随机数字
+ */
+ public static int num(int num) {
+ return RANDOM.nextInt(num);
+ }
+
+ public static char alpha() {
+ return ALPHA[num(0, ALPHA.length)];
+ }
+}
diff --git a/basic-util/src/main/java/ink/wgink/util/verification/code/SpecCaptcha.java b/basic-util/src/main/java/ink/wgink/util/verification/code/SpecCaptcha.java
new file mode 100644
index 00000000..eb4548f7
--- /dev/null
+++ b/basic-util/src/main/java/ink/wgink/util/verification/code/SpecCaptcha.java
@@ -0,0 +1,102 @@
+package ink.wgink.util.verification.code;
+
+import javax.imageio.ImageIO;
+import java.awt.*;
+import java.awt.image.BufferedImage;
+import java.io.IOException;
+import java.io.OutputStream;
+
+import static ink.wgink.util.verification.code.Randoms.num;
+
+/**
+ * When you feel like quitting. Think about why you started
+ * 当你想要放弃的时候，想想当初你为何开始
+ *
+ * @ClassName: SpecCaptcha
+ * @Description: PHG验证码
+ * @Author: WangGeng
+ * @Date: 2019/9/26 9:22 下午
+ * @Version: 1.0
+ **/
+public class SpecCaptcha extends Captcha {
+
+ public SpecCaptcha() {
+ }
+
+ public SpecCaptcha(int width, int height) {
+ this.width = width;
+ this.height = height;
+ }
+
+ public SpecCaptcha(int width, int height, int len) {
+ this(width, height);
+ this.len = len;
+ }
+
+ public SpecCaptcha(int width, int height, int len, Font font) {
+ this(width, height, len);
+ this.font = font;
+ }
+
+ /**
+ * 生成验证码
+ *
+ * @throws IOException IO异常
+ */
+ @Override
+ public void out(OutputStream out) {
+ graphicsImage(alphas(), out);
+ }
+
+ /**
+ * 画随机码图
+ *
+ * @param strs 文本
+ * @param out 输出流
+ */
+ private boolean graphicsImage(char[] strs, OutputStream out) {
+ boolean ok = false;
+ try {
+ BufferedImage bi = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB);
+ Graphics2D g = (Graphics2D) bi.getGraphics();
+ AlphaComposite ac3;
+ Color color;
+ int len = strs.length;
+ g.setColor(Color.WHITE);
+ g.fillRect(0, 0, width, height);
+ // 随机画干扰的蛋蛋
+ for (int i = 0; i < 15; i++) {
+ color = color(150, 250);
+ g.setColor(color);
+ // 画蛋蛋，有蛋的生活才精彩
+ g.drawOval(num(width), num(height), 5 + num(10), 5 + num(10));
+ color = null;
+ }
+ g.setFont(font);
+ int h = height - ((height - font.getSize()) >> 1),
+ w = width / len,
+ size = w - font.getSize() + 1;
+ /* 画字符串 */
+ for (int i = 0; i < len; i++) {
+ // 指定透明度
+ ac3 = AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 0.7f);
+ g.setComposite(ac3);
+ // 对每个字符都用随机颜色
+ color = new Color(20 + num(110), 20 + num(110), 20 + num(110));
+ g.setColor(color);
+ g.drawString(strs[i] + "", (width - (len - i) * w) + size, h - 4);
+ color = null;
+ ac3 = null;
+ }
+ ImageIO.write(bi, "png", out);
+ out.flush();
+ ok = true;
+ } catch (IOException e) {
+ ok = false;
+ } finally {
+ Streams.close(out);
+ }
+ return ok;
+ }
+
+}
diff --git a/basic-util/src/main/java/ink/wgink/util/verification/code/Streams.java b/basic-util/src/main/java/ink/wgink/util/verification/code/Streams.java
new file mode 100644
index 00000000..a991fbe9
--- /dev/null
+++ b/basic-util/src/main/java/ink/wgink/util/verification/code/Streams.java
@@ -0,0 +1,54 @@
+package ink.wgink.util.verification.code;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+
+/**
+ * When you feel like quitting. Think about why you started
+ * 当你想要放弃的时候，想想当初你为何开始
+ *
+ * @ClassName: Streams
+ * @Description: 流
+ * @Author: WangGeng
+ * @Date: 2019/9/26 9:19 下午
+ * @Version: 1.0
+ **/
+public class Streams {
+ /**
+ * 关闭输入流
+ *
+ * @param in 输入流
+ */
+ public static void close(InputStream in) {
+ if (in != null) {
+ try {
+ in.close();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ }
+ }
+
+ /**
+ * 关闭输出流
+ *
+ * @param out 输出流
+ */
+ public static void close(OutputStream out) {
+ if (out != null) {
+ try {
+ out.flush();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ try {
+ out.close();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ }
+ }
+
+
+}
diff --git a/login-base/src/main/java/ink/wgink/login/base/BaseAuthenticationProcessingFilter.java b/login-base/src/main/java/ink/wgink/login/base/authentication/BaseAuthenticationProcessingFilter.java
similarity index 88%
rename from login-base/src/main/java/ink/wgink/login/base/BaseAuthenticationProcessingFilter.java
rename to login-base/src/main/java/ink/wgink/login/base/authentication/BaseAuthenticationProcessingFilter.java
index eb68e7fe..a71a417a 100644
--- a/login-base/src/main/java/ink/wgink/login/base/BaseAuthenticationProcessingFilter.java
+++ b/login-base/src/main/java/ink/wgink/login/base/authentication/BaseAuthenticationProcessingFilter.java
@@ -1,4 +1,4 @@
-package ink.wgink.login.base;
+package ink.wgink.login.base.authentication;
import ink.wgink.interfaces.consts.ISystemConstant;
import ink.wgink.login.base.exceptions.UserAuthenticationException;
@@ -22,10 +22,10 @@ import java.util.Map;
**/
public abstract class BaseAuthenticationProcessingFilter extends AbstractAuthenticationProcessingFilter {
- public static final String KEY_USERNAME = "username";
- public static final String KEY_PASSWORD = "password";
- public static final String METHOD_POST = "POST";
- public static final String DING_DING_LOGIN_TMP_CODE = "code";
+ protected static final String KEY_USERNAME = "username";
+ protected static final String KEY_PASSWORD = "password";
+ protected static final String METHOD_POST = "POST";
+ protected static final String DING_DING_LOGIN_TMP_CODE = "code";
protected BaseAuthenticationProcessingFilter(String defaultFilterProcessesUrl) {
super(defaultFilterProcessesUrl);
diff --git a/login-base/src/main/java/ink/wgink/login/base/authentication/UserAuthenticationFilter.java b/login-base/src/main/java/ink/wgink/login/base/authentication/user/UserAuthenticationFilter.java
similarity index 94%
rename from login-base/src/main/java/ink/wgink/login/base/authentication/UserAuthenticationFilter.java
rename to login-base/src/main/java/ink/wgink/login/base/authentication/user/UserAuthenticationFilter.java
index 8b4e79ce..ee213bf8 100644
--- a/login-base/src/main/java/ink/wgink/login/base/authentication/UserAuthenticationFilter.java
+++ b/login-base/src/main/java/ink/wgink/login/base/authentication/user/UserAuthenticationFilter.java
@@ -1,6 +1,6 @@
-package ink.wgink.login.base.authentication;
+package ink.wgink.login.base.authentication.user;
-import ink.wgink.login.base.BaseAuthenticationProcessingFilter;
+import ink.wgink.login.base.authentication.BaseAuthenticationProcessingFilter;
import ink.wgink.login.base.exceptions.UserAuthenticationException;
import org.apache.commons.lang3.StringUtils;
import org.springframework.security.core.Authentication;
diff --git a/login-base/src/main/java/ink/wgink/login/base/authentication/UserAuthenticationProvider.java b/login-base/src/main/java/ink/wgink/login/base/authentication/user/UserAuthenticationProvider.java
similarity index 91%
rename from login-base/src/main/java/ink/wgink/login/base/authentication/UserAuthenticationProvider.java
rename to login-base/src/main/java/ink/wgink/login/base/authentication/user/UserAuthenticationProvider.java
index 7a8eb1c3..8db3e8f9 100644
--- a/login-base/src/main/java/ink/wgink/login/base/authentication/UserAuthenticationProvider.java
+++ b/login-base/src/main/java/ink/wgink/login/base/authentication/user/UserAuthenticationProvider.java
@@ -1,10 +1,11 @@
-package ink.wgink.login.base.authentication;
+package ink.wgink.login.base.authentication.user;
import ink.wgink.interfaces.consts.ISystemConstant;
import ink.wgink.login.base.enums.LoginTypeEnum;
import ink.wgink.login.base.exceptions.UserAuthenticationException;
-import ink.wgink.login.base.service.UserLoginService;
+import ink.wgink.login.base.service.user.UserLoginService;
import ink.wgink.pojo.bos.LoginUser;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.security.authentication.AuthenticationProvider;
import org.springframework.security.core.Authentication;
import org.springframework.security.core.AuthenticationException;
@@ -34,7 +35,7 @@ public class UserAuthenticationProvider implements AuthenticationProvider {
if (!passwordEncoder.matches(userAuthenticationToken.getCredentials().toString(), loginUser.getPassword())) {
throw new UserAuthenticationException("用户名或密码错误");
}
- if (!ISystemConstant.ADMIN.equals(loginUser.getUsername())) {
+ if (!StringUtils.equalsIgnoreCase(ISystemConstant.ADMIN, loginUser.getUsername())) {
userLoginService.setUserDataAuthority(loginUser);
}
userLoginService.updateUserLoginInfo(loginUser.getUserId(), loginUser.getUserName(), LoginTypeEnum.USERNAME_AND_PASSWORD.getValue());
diff --git a/login-base/src/main/java/ink/wgink/login/base/authentication/UserAuthenticationToken.java b/login-base/src/main/java/ink/wgink/login/base/authentication/user/UserAuthenticationToken.java
similarity index 97%
rename from login-base/src/main/java/ink/wgink/login/base/authentication/UserAuthenticationToken.java
rename to login-base/src/main/java/ink/wgink/login/base/authentication/user/UserAuthenticationToken.java
index ecf31c51..6eedd71c 100644
--- a/login-base/src/main/java/ink/wgink/login/base/authentication/UserAuthenticationToken.java
+++ b/login-base/src/main/java/ink/wgink/login/base/authentication/user/UserAuthenticationToken.java
@@ -1,4 +1,4 @@
-package ink.wgink.login.base.authentication;
+package ink.wgink.login.base.authentication.user;
import org.springframework.security.authentication.AbstractAuthenticationToken;
import org.springframework.security.core.GrantedAuthority;
diff --git a/login-base/src/main/java/ink/wgink/login/base/config/properties/SystemProperties.java b/login-base/src/main/java/ink/wgink/login/base/config/properties/SystemProperties.java
index b657642a..1d45f60f 100644
--- a/login-base/src/main/java/ink/wgink/login/base/config/properties/SystemProperties.java
+++ b/login-base/src/main/java/ink/wgink/login/base/config/properties/SystemProperties.java
@@ -20,9 +20,10 @@ public class SystemProperties {
private Integer port;
private String url;
private String ws;
- private String title;
+ private String systemTitle;
+ private String systemSubTitle;
private String portalUrl;
- private String loginPageName;
+ private String defaultFrame;
public Integer getPort() {
return port;
@@ -41,19 +42,27 @@ public class SystemProperties {
}
public String getWs() {
- return ws;
+ return ws == null ? "" : ws.trim();
}
public void setWs(String ws) {
this.ws = ws;
}
- public String getTitle() {
- return title == null ? "" : title.trim();
+ public String getSystemTitle() {
+ return systemTitle == null ? "" : systemTitle.trim();
}
- public void setTitle(String title) {
- this.title = title;
+ public void setSystemTitle(String systemTitle) {
+ this.systemTitle = systemTitle;
+ }
+
+ public String getSystemSubTitle() {
+ return systemSubTitle == null ? "" : systemSubTitle.trim();
+ }
+
+ public void setSystemSubTitle(String systemSubTitle) {
+ this.systemSubTitle = systemSubTitle;
}
public String getPortalUrl() {
@@ -64,11 +73,32 @@ public class SystemProperties {
this.portalUrl = portalUrl;
}
- public String getLoginPageName() {
- return loginPageName == null ? "" : loginPageName.trim();
+ public String getDefaultFrame() {
+ return defaultFrame == null ? "" : defaultFrame.trim();
}
- public void setLoginPageName(String loginPageName) {
- this.loginPageName = loginPageName;
+ public void setDefaultFrame(String defaultFrame) {
+ this.defaultFrame = defaultFrame;
+ }
+
+ @Override
+ public String toString() {
+ final StringBuilder sb = new StringBuilder("{");
+ sb.append("\"port\":")
+ .append(port);
+ sb.append(",\"url\":\"")
+ .append(url).append('\"');
+ sb.append(",\"ws\":\"")
+ .append(ws).append('\"');
+ sb.append(",\"systemTitle\":\"")
+ .append(systemTitle).append('\"');
+ sb.append(",\"systemSubTitle\":\"")
+ .append(systemSubTitle).append('\"');
+ sb.append(",\"portalUrl\":\"")
+ .append(portalUrl).append('\"');
+ sb.append(",\"defaultFrame\":\"")
+ .append(defaultFrame).append('\"');
+ sb.append('}');
+ return sb.toString();
}
}
diff --git a/login-base/src/main/java/ink/wgink/login/base/consts/IUserCenterConst.java b/login-base/src/main/java/ink/wgink/login/base/consts/IUserCenterConst.java
index c84a875a..61499dda 100644
--- a/login-base/src/main/java/ink/wgink/login/base/consts/IUserCenterConst.java
+++ b/login-base/src/main/java/ink/wgink/login/base/consts/IUserCenterConst.java
@@ -21,18 +21,6 @@ public interface IUserCenterConst {
* 登录背景图片
*/
String LOGIN_BACKGROUND_IMAGES = "loginBackgroundImages";
- /**
- * 系统名称
- */
- String SYSTEM_NAME = "systemName";
- /**
- * 登录页面名称
- */
- String LOGIN_PAGE_NAME = "loginPageName";
- /**
- * 系统名称字体
- */
- String SYSTEM_NAME_SIZE = "systemNameSize";
/**
* 系统标题
*/
@@ -41,6 +29,14 @@ public interface IUserCenterConst {
* 系统标题字体大小
*/
String SYSTEM_TITLE_SIZE = "systemTitleSize";
+ /**
+ * 系统子标题
+ */
+ String SYSTEM_SUB_TITLE = "systemSubTitle";
+ /**
+ * 系统子标题大小
+ */
+ String SYSTEM_SUB_TITLE_SIZE = "systemSubTitleSize";
/**
* 版权年份
*/
diff --git a/login-base/src/main/java/ink/wgink/login/base/controller/api/config/ConfigController.java b/login-base/src/main/java/ink/wgink/login/base/controller/api/config/ConfigController.java
index 1dae7471..33d70271 100644
--- a/login-base/src/main/java/ink/wgink/login/base/controller/api/config/ConfigController.java
+++ b/login-base/src/main/java/ink/wgink/login/base/controller/api/config/ConfigController.java
@@ -1,7 +1,9 @@
package ink.wgink.login.base.controller.api.config;
import ink.wgink.annotation.CheckRequestBodyAnnotation;
+import ink.wgink.exceptions.ParamsException;
import ink.wgink.interfaces.consts.ISystemConstant;
+import ink.wgink.login.base.consts.IUserCenterConst;
import ink.wgink.login.base.pojo.vos.ConfigVO;
import ink.wgink.login.base.service.config.IConfigService;
import ink.wgink.pojo.result.ErrorResult;
@@ -10,6 +12,7 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiResponse;
import io.swagger.annotations.ApiResponses;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -38,6 +41,16 @@ public class ConfigController {
@PutMapping("updateconfig")
@CheckRequestBodyAnnotation
public SuccessResult updateConfig(@RequestBody ConfigVO configVO) throws Exception {
+ if (!StringUtils.isBlank(configVO.getuKeyLogin())) {
+ if (!StringUtils.equals(ISystemConstant.IS_TRUE, configVO.getuKeyLogin()) && !StringUtils.equals(ISystemConstant.IS_FALSE, configVO.getuKeyLogin())) {
+ throw new ParamsException("uKey登录只能是true和false");
+ }
+ }
+ if (!StringUtils.isBlank(configVO.getScanCodeLogin())) {
+ if (!StringUtils.equals(ISystemConstant.IS_FALSE, configVO.getScanCodeLogin()) && !StringUtils.equals(IUserCenterConst.DING_DING_SCAN_CODE, configVO.getScanCodeLogin())) {
+ throw new ParamsException("uKey登录只能是false和dingDingScanCode");
+ }
+ }
configService.updateConfig(configVO);
return new SuccessResult();
}
diff --git a/login-base/src/main/java/ink/wgink/login/base/controller/route/IndexRouteController.java b/login-base/src/main/java/ink/wgink/login/base/controller/route/IndexRouteController.java
index 1ea66a34..3e8c7382 100644
--- a/login-base/src/main/java/ink/wgink/login/base/controller/route/IndexRouteController.java
+++ b/login-base/src/main/java/ink/wgink/login/base/controller/route/IndexRouteController.java
@@ -2,7 +2,6 @@ package ink.wgink.login.base.controller.route;
import ink.wgink.common.component.SecurityComponent;
import ink.wgink.interfaces.menu.IMenuBaseService;
-import ink.wgink.interfaces.user.IUserCheckService;
import ink.wgink.login.base.config.properties.SystemProperties;
import ink.wgink.login.base.consts.IUserCenterConst;
import ink.wgink.login.base.manager.ConfigManager;
@@ -13,6 +12,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.servlet.ModelAndView;
+import org.springframework.web.servlet.view.RedirectView;
import java.util.List;
import java.util.Map;
@@ -44,15 +44,15 @@ public class IndexRouteController {
UserInfoBO userInfoBO = securityComponent.getCurrentUser();
mv.addObject("userUsername", userInfoBO.getUserUsername());
Map config = ConfigManager.getInstance().getConfig();
- if (!Objects.isNull(config.get(IUserCenterConst.LOGIN_PAGE_NAME)) && !StringUtils.isBlank(config.get(IUserCenterConst.LOGIN_PAGE_NAME).toString())) {
- mv.addObject(IUserCenterConst.LOGIN_PAGE_NAME, config.get(IUserCenterConst.LOGIN_PAGE_NAME).toString());
- } else {
- mv.addObject(IUserCenterConst.LOGIN_PAGE_NAME, systemProperties.getLoginPageName());
- }
if (!Objects.isNull(config.get(IUserCenterConst.SYSTEM_TITLE)) && !StringUtils.isBlank(config.get(IUserCenterConst.SYSTEM_TITLE).toString())) {
mv.addObject(IUserCenterConst.SYSTEM_TITLE, config.get(IUserCenterConst.SYSTEM_TITLE).toString());
} else {
- mv.addObject(IUserCenterConst.SYSTEM_TITLE, systemProperties.getTitle());
+ mv.addObject(IUserCenterConst.SYSTEM_TITLE, systemProperties.getSystemTitle());
+ }
+ if (!Objects.isNull(config.get(IUserCenterConst.SYSTEM_SUB_TITLE)) && !StringUtils.isBlank(config.get(IUserCenterConst.SYSTEM_SUB_TITLE).toString())) {
+ mv.addObject(IUserCenterConst.SYSTEM_SUB_TITLE, config.get(IUserCenterConst.SYSTEM_SUB_TITLE).toString());
+ } else {
+ mv.addObject(IUserCenterConst.SYSTEM_SUB_TITLE, systemProperties.getSystemSubTitle());
}
// 系统LOGO
if (!Objects.isNull(config.get(IUserCenterConst.SYSTEM_LOGO)) && !StringUtils.isBlank(config.get(IUserCenterConst.SYSTEM_LOGO).toString())) {
@@ -68,4 +68,20 @@ public class IndexRouteController {
return mv;
}
+ /**
+ * 默认
+ *
+ * @return
+ */
+ @GetMapping("default-frame")
+ public ModelAndView defaultFrame() {
+ ModelAndView mv;
+ if (!StringUtils.isBlank(systemProperties.getDefaultFrame())) {
+ mv = new ModelAndView(new RedirectView(systemProperties.getDefaultFrame()));
+ } else {
+ mv = new ModelAndView("default");
+ }
+ return mv;
+ }
+
}
diff --git a/login-base/src/main/java/ink/wgink/login/base/controller/route/OAuthRouteController.java b/login-base/src/main/java/ink/wgink/login/base/controller/route/OAuthRouteController.java
index 67cdfae0..90fe556f 100644
--- a/login-base/src/main/java/ink/wgink/login/base/controller/route/OAuthRouteController.java
+++ b/login-base/src/main/java/ink/wgink/login/base/controller/route/OAuthRouteController.java
@@ -1,25 +1,25 @@
package ink.wgink.login.base.controller.route;
import ink.wgink.interfaces.consts.ISystemConstant;
-import ink.wgink.interfaces.menu.IMenuBaseService;
-import ink.wgink.interfaces.user.IUserCheckService;
import ink.wgink.login.base.config.properties.SystemProperties;
import ink.wgink.login.base.consts.IUserCenterConst;
import ink.wgink.login.base.manager.ConfigManager;
-import ink.wgink.pojo.dtos.menu.MenuDTO;
+import ink.wgink.util.verification.code.Captcha;
+import ink.wgink.util.verification.code.GifCaptcha;
+import ink.wgink.util.verification.code.SpecCaptcha;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.web.authentication.logout.SecurityContextLogoutHandler;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.servlet.ModelAndView;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
import java.util.Map;
import java.util.Objects;
@@ -65,29 +65,29 @@ public class OAuthRouteController {
} else {
mv.addObject(IUserCenterConst.LOGIN_BACKGROUND_IMAGES, "");
}
- // 系统名称
- if (!Objects.isNull(config.get(IUserCenterConst.SYSTEM_NAME)) && !StringUtils.isBlank(config.get(IUserCenterConst.SYSTEM_NAME).toString())) {
- mv.addObject(IUserCenterConst.LOGIN_PAGE_NAME, config.get(IUserCenterConst.SYSTEM_NAME).toString());
- } else {
- mv.addObject(IUserCenterConst.LOGIN_PAGE_NAME, systemProperties.getLoginPageName());
- }
- // 系统名称大小
- if (!Objects.isNull(config.get(IUserCenterConst.SYSTEM_NAME_SIZE)) && Integer.parseInt(config.get(IUserCenterConst.SYSTEM_NAME_SIZE).toString()) > 12) {
- mv.addObject(IUserCenterConst.SYSTEM_NAME_SIZE, Integer.parseInt(config.get(IUserCenterConst.SYSTEM_NAME_SIZE).toString()));
- } else {
- mv.addObject(IUserCenterConst.SYSTEM_NAME_SIZE, 26);
- }
// 系统标题
if (!Objects.isNull(config.get(IUserCenterConst.SYSTEM_TITLE)) && !StringUtils.isBlank(config.get(IUserCenterConst.SYSTEM_TITLE).toString())) {
mv.addObject(IUserCenterConst.SYSTEM_TITLE, config.get(IUserCenterConst.SYSTEM_TITLE).toString());
} else {
- mv.addObject(IUserCenterConst.SYSTEM_TITLE, systemProperties.getTitle());
+ mv.addObject(IUserCenterConst.SYSTEM_TITLE, systemProperties.getSystemTitle());
}
// 系统标题大小
- if (!Objects.isNull(config.get(IUserCenterConst.SYSTEM_TITLE_SIZE)) && Integer.parseInt(config.get(IUserCenterConst.SYSTEM_TITLE_SIZE).toString()) > 12) {
- mv.addObject(IUserCenterConst.SYSTEM_TITLE_SIZE, Integer.parseInt(config.get(IUserCenterConst.SYSTEM_TITLE_SIZE).toString()));
+ if (!Objects.isNull(config.get(IUserCenterConst.SYSTEM_SUB_TITLE_SIZE)) && Integer.parseInt(config.get(IUserCenterConst.SYSTEM_SUB_TITLE_SIZE).toString()) > 12) {
+ mv.addObject(IUserCenterConst.SYSTEM_SUB_TITLE_SIZE, Integer.parseInt(config.get(IUserCenterConst.SYSTEM_SUB_TITLE_SIZE).toString()));
} else {
- mv.addObject(IUserCenterConst.SYSTEM_TITLE_SIZE, 16);
+ mv.addObject(IUserCenterConst.SYSTEM_SUB_TITLE_SIZE, 26);
+ }
+ // 系统子标题
+ if (!Objects.isNull(config.get(IUserCenterConst.SYSTEM_SUB_TITLE)) && !StringUtils.isBlank(config.get(IUserCenterConst.SYSTEM_SUB_TITLE).toString())) {
+ mv.addObject(IUserCenterConst.SYSTEM_SUB_TITLE, config.get(IUserCenterConst.SYSTEM_SUB_TITLE).toString());
+ } else {
+ mv.addObject(IUserCenterConst.SYSTEM_SUB_TITLE, systemProperties.getSystemSubTitle());
+ }
+ // 系统子标题大小
+ if (!Objects.isNull(config.get(IUserCenterConst.SYSTEM_SUB_TITLE_SIZE)) && Integer.parseInt(config.get(IUserCenterConst.SYSTEM_SUB_TITLE_SIZE).toString()) > 12) {
+ mv.addObject(IUserCenterConst.SYSTEM_SUB_TITLE_SIZE, Integer.parseInt(config.get(IUserCenterConst.SYSTEM_SUB_TITLE_SIZE).toString()));
+ } else {
+ mv.addObject(IUserCenterConst.SYSTEM_SUB_TITLE_SIZE, 16);
}
// 版权年份
if (!Objects.isNull(config.get(IUserCenterConst.COPY_RIGHT_YEAR))) {
@@ -156,4 +156,29 @@ public class OAuthRouteController {
}
}
+ /**
+ * 验证码
+ *
+ * @param request
+ * @param response
+ * @throws IOException
+ */
+ @GetMapping("verification-code/{type}")
+ public void verificationCode(@PathVariable("type") String type, HttpServletRequest request, HttpServletResponse response) throws IOException {
+ HttpSession session = request.getSession(true);
+ response.setHeader("Pragma", "No-cache");
+ response.setHeader("Cache-Control", "no-cache");
+ response.setDateHeader("Expires", 0);
+ Captcha captcha;
+ if (StringUtils.equalsIgnoreCase("png", type)) {
+ response.setContentType("image/png");
+ captcha = new SpecCaptcha(130, 38, 5);
+ } else {
+ response.setContentType("image/gif");
+ captcha = new GifCaptcha(130, 38, 5);
+ }
+ captcha.out(response.getOutputStream());
+ session.setAttribute(ISystemConstant.VERIFICATION_CODE, captcha.text().toLowerCase());
+ }
+
}
diff --git a/login-base/src/main/java/ink/wgink/login/base/controller/route/config/ConfigRouteController.java b/login-base/src/main/java/ink/wgink/login/base/controller/route/config/ConfigRouteController.java
index 1a548acd..06136323 100644
--- a/login-base/src/main/java/ink/wgink/login/base/controller/route/config/ConfigRouteController.java
+++ b/login-base/src/main/java/ink/wgink/login/base/controller/route/config/ConfigRouteController.java
@@ -1,12 +1,18 @@
package ink.wgink.login.base.controller.route.config;
import ink.wgink.interfaces.consts.ISystemConstant;
+import ink.wgink.login.base.manager.ConfigManager;
+import ink.wgink.login.base.service.IDingDingService;
+import ink.wgink.login.base.service.IUKeyService;
import io.swagger.annotations.Api;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.servlet.ModelAndView;
+import java.util.Map;
+
/**
* When you feel like quitting. Think about why you started
* 当你想要放弃的时候，想想当初你为何开始
@@ -22,9 +28,21 @@ import org.springframework.web.servlet.ModelAndView;
@RequestMapping(ISystemConstant.ROUTE_PREFIX + "/config")
public class ConfigRouteController {
+ @Autowired(required = false)
+ private IUKeyService uKeyService;
+ @Autowired(required = false)
+ private IDingDingService dingDingService;
+
@GetMapping("update")
public ModelAndView update() {
- return new ModelAndView("config/update");
+ ModelAndView mv = new ModelAndView("config/update");
+ if(uKeyService != null) {
+ mv.addObject("uKeyLogin", "uKeyLogin");
+ }
+ if (dingDingService != null) {
+ mv.addObject("dingDingScanLogin", "dingDingScanLogin");
+ }
+ return mv;
}
}
diff --git a/login-base/src/main/java/ink/wgink/login/base/pojo/vos/ConfigVO.java b/login-base/src/main/java/ink/wgink/login/base/pojo/vos/ConfigVO.java
index 57a62e2c..2b474f35 100644
--- a/login-base/src/main/java/ink/wgink/login/base/pojo/vos/ConfigVO.java
+++ b/login-base/src/main/java/ink/wgink/login/base/pojo/vos/ConfigVO.java
@@ -40,14 +40,14 @@ public class ConfigVO {
private String loginBackgroundImages;
@ApiModelProperty(name = "systemLogo", value = "系统LOGO")
private String systemLogo;
- @ApiModelProperty(name = "systemName", value = "系统名称")
- private String systemName;
- @ApiModelProperty(name = "systemNameSize", value = "系统名称字体大小")
- private Integer systemNameSize;
- @ApiModelProperty(name = "systemTitle", value = "系统标题")
+ @ApiModelProperty(name = "systemTitle", value = "系统主名称")
private String systemTitle;
- @ApiModelProperty(name = "systemTitleSize", value = "系统标题字体大小")
+ @ApiModelProperty(name = "systemTitleSize", value = "系统主名称字体大小")
private Integer systemTitleSize;
+ @ApiModelProperty(name = "systemSubTitleSize", value = "系统副标题")
+ private String systemSubTitle;
+ @ApiModelProperty(name = "systemSubTitleSize", value = "系统副标题字体大小")
+ private Integer systemSubTitleSize;
@ApiModelProperty(name = "copyRightYear", value = "版权年份")
private String copyRightYear;
@ApiModelProperty(name = "copyleft", value = "版权所有")
@@ -61,10 +61,8 @@ public class ConfigVO {
@CheckEmptyAnnotation(name = "验证码状态", types = {ISystemConstant.IS_TRUE, ISystemConstant.IS_FALSE})
private String verificationCode;
@ApiModelProperty(name = "uKeyLogin", value = "uKey登录")
- @CheckEmptyAnnotation(name = "uKey登录", types = {ISystemConstant.IS_TRUE, ISystemConstant.IS_FALSE})
private String uKeyLogin;
@ApiModelProperty(name = "scanCodeLogin", value = "扫码登录")
- @CheckEmptyAnnotation(name = "扫码登录", types = {ISystemConstant.IS_FALSE, IUserCenterConst.DING_DING_SCAN_CODE})
private String scanCodeLogin;
@ApiModelProperty(name = "loginBoxPosition", value = "登录框位置")
private String loginBoxPosition;
@@ -125,22 +123,6 @@ public class ConfigVO {
this.systemLogo = systemLogo;
}
- public String getSystemName() {
- return systemName == null ? "" : systemName.trim();
- }
-
- public void setSystemName(String systemName) {
- this.systemName = systemName;
- }
-
- public Integer getSystemNameSize() {
- return systemNameSize == null ? 26 : systemNameSize;
- }
-
- public void setSystemNameSize(Integer systemNameSize) {
- this.systemNameSize = systemNameSize;
- }
-
public String getSystemTitle() {
return systemTitle == null ? "" : systemTitle.trim();
}
@@ -150,13 +132,29 @@ public class ConfigVO {
}
public Integer getSystemTitleSize() {
- return systemTitleSize == null ? 16 : systemTitleSize;
+ return systemTitleSize == null ? 26 : systemTitleSize;
}
public void setSystemTitleSize(Integer systemTitleSize) {
this.systemTitleSize = systemTitleSize;
}
+ public String getSystemSubTitle() {
+ return systemSubTitle == null ? "" : systemSubTitle.trim();
+ }
+
+ public void setSystemSubTitle(String systemSubTitle) {
+ this.systemSubTitle = systemSubTitle;
+ }
+
+ public Integer getSystemSubTitleSize() {
+ return systemSubTitleSize == null ? 16 : systemSubTitleSize;
+ }
+
+ public void setSystemSubTitleSize(Integer systemSubTitleSize) {
+ this.systemSubTitleSize = systemSubTitleSize;
+ }
+
public String getCopyRightYear() {
return copyRightYear == null ? "" : copyRightYear.trim();
}
diff --git a/login-base/src/main/java/ink/wgink/login/base/security/WebSecurityConfig.java b/login-base/src/main/java/ink/wgink/login/base/security/WebSecurityConfig.java
index aa87d038..efe21f38 100644
--- a/login-base/src/main/java/ink/wgink/login/base/security/WebSecurityConfig.java
+++ b/login-base/src/main/java/ink/wgink/login/base/security/WebSecurityConfig.java
@@ -5,8 +5,8 @@ import ink.wgink.login.base.config.BaseConfig;
import ink.wgink.login.base.handler.LoginFailureHandler;
import ink.wgink.login.base.handler.LogoutHandler;
import ink.wgink.login.base.security.user.UserSecurityConfig;
-import ink.wgink.login.base.service.UserDetailServiceImpl;
-import ink.wgink.login.base.service.UserLoginService;
+import ink.wgink.login.base.service.user.UserDetailServiceImpl;
+import ink.wgink.login.base.service.user.UserLoginService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Bean;
import org.springframework.security.authentication.AuthenticationManager;
diff --git a/login-base/src/main/java/ink/wgink/login/base/security/user/UserSecurityConfig.java b/login-base/src/main/java/ink/wgink/login/base/security/user/UserSecurityConfig.java
index 80cbcc5c..23007333 100644
--- a/login-base/src/main/java/ink/wgink/login/base/security/user/UserSecurityConfig.java
+++ b/login-base/src/main/java/ink/wgink/login/base/security/user/UserSecurityConfig.java
@@ -1,10 +1,10 @@
package ink.wgink.login.base.security.user;
-import ink.wgink.login.base.authentication.UserAuthenticationFilter;
-import ink.wgink.login.base.authentication.UserAuthenticationProvider;
+import ink.wgink.login.base.authentication.user.UserAuthenticationFilter;
+import ink.wgink.login.base.authentication.user.UserAuthenticationProvider;
import ink.wgink.login.base.handler.LoginFailureHandler;
-import ink.wgink.login.base.service.UserDetailServiceImpl;
-import ink.wgink.login.base.service.UserLoginService;
+import ink.wgink.login.base.service.user.UserDetailServiceImpl;
+import ink.wgink.login.base.service.user.UserLoginService;
import org.springframework.security.authentication.AuthenticationManager;
import org.springframework.security.config.annotation.SecurityConfigurerAdapter;
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
diff --git a/login-base/src/main/java/ink/wgink/login/base/service/IDingDingService.java b/login-base/src/main/java/ink/wgink/login/base/service/IDingDingService.java
new file mode 100644
index 00000000..8e55a9bc
--- /dev/null
+++ b/login-base/src/main/java/ink/wgink/login/base/service/IDingDingService.java
@@ -0,0 +1,14 @@
+package ink.wgink.login.base.service;
+
+/**
+ * When you feel like quitting. Think about why you started
+ * 当你想要放弃的时候，想想当初你为何开始
+ *
+ * @ClassName: IDingDingService
+ * @Description: 钉钉业务
+ * @Author: WangGeng
+ * @Date: 2021/2/27 21:21
+ * @Version: 1.0
+ **/
+public interface IDingDingService {
+}
diff --git a/login-base/src/main/java/ink/wgink/login/base/service/IUKeyService.java b/login-base/src/main/java/ink/wgink/login/base/service/IUKeyService.java
new file mode 100644
index 00000000..cb366a15
--- /dev/null
+++ b/login-base/src/main/java/ink/wgink/login/base/service/IUKeyService.java
@@ -0,0 +1,14 @@
+package ink.wgink.login.base.service;
+
+/**
+ * When you feel like quitting. Think about why you started
+ * 当你想要放弃的时候，想想当初你为何开始
+ *
+ * @ClassName: IUKeyService
+ * @Description: UKey
+ * @Author: WangGeng
+ * @Date: 2021/2/27 21:22
+ * @Version: 1.0
+ **/
+public interface IUKeyService {
+}
diff --git a/login-base/src/main/java/ink/wgink/login/base/service/IWechatMiniService.java b/login-base/src/main/java/ink/wgink/login/base/service/IWechatMiniService.java
new file mode 100644
index 00000000..9de59ac0
--- /dev/null
+++ b/login-base/src/main/java/ink/wgink/login/base/service/IWechatMiniService.java
@@ -0,0 +1,14 @@
+package ink.wgink.login.base.service;
+
+/**
+ * When you feel like quitting. Think about why you started
+ * 当你想要放弃的时候，想想当初你为何开始
+ *
+ * @ClassName: IWechatMiniService
+ * @Description: 微信小程序
+ * @Author: WangGeng
+ * @Date: 2021/2/27 21:22
+ * @Version: 1.0
+ **/
+public interface IWechatMiniService {
+}
diff --git a/login-base/src/main/java/ink/wgink/login/base/service/IWechatOfficialAccountService.java b/login-base/src/main/java/ink/wgink/login/base/service/IWechatOfficialAccountService.java
new file mode 100644
index 00000000..dd705a66
--- /dev/null
+++ b/login-base/src/main/java/ink/wgink/login/base/service/IWechatOfficialAccountService.java
@@ -0,0 +1,14 @@
+package ink.wgink.login.base.service;
+
+/**
+ * When you feel like quitting. Think about why you started
+ * 当你想要放弃的时候，想想当初你为何开始
+ *
+ * @ClassName: IWechatOfficalService
+ * @Description: 微信公众号
+ * @Author: WangGeng
+ * @Date: 2021/2/27 21:23
+ * @Version: 1.0
+ **/
+public interface IWechatOfficialAccountService {
+}
diff --git a/login-base/src/main/java/ink/wgink/login/base/service/UserDetailServiceImpl.java b/login-base/src/main/java/ink/wgink/login/base/service/user/UserDetailServiceImpl.java
similarity index 98%
rename from login-base/src/main/java/ink/wgink/login/base/service/UserDetailServiceImpl.java
rename to login-base/src/main/java/ink/wgink/login/base/service/user/UserDetailServiceImpl.java
index 82f2b25e..4d2116a3 100644
--- a/login-base/src/main/java/ink/wgink/login/base/service/UserDetailServiceImpl.java
+++ b/login-base/src/main/java/ink/wgink/login/base/service/user/UserDetailServiceImpl.java
@@ -1,4 +1,4 @@
-package ink.wgink.login.base.service;
+package ink.wgink.login.base.service.user;
import com.alibaba.fastjson.JSONObject;
import ink.wgink.interfaces.consts.ISystemConstant;
@@ -19,14 +19,12 @@ import ink.wgink.pojo.pos.RolePO;
import ink.wgink.service.department.service.IDepartmentUserService;
import ink.wgink.service.user.pojo.pos.UserPO;
import ink.wgink.service.user.service.IUserService;
-import ink.wgink.util.date.DateUtil;
import org.apache.commons.lang3.StringUtils;
import org.joda.time.DateTime;
import org.joda.time.format.DateTimeFormat;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.cache.CacheManager;
import org.springframework.security.core.GrantedAuthority;
import org.springframework.security.core.userdetails.UserDetails;
import org.springframework.security.core.userdetails.UserDetailsService;
@@ -87,7 +85,7 @@ public class UserDetailServiceImpl implements UserDetailsService {
LOG.debug("设置权限权限");
LoginUser loginUser;
Set grantedAuthorities = new LinkedHashSet<>();
- if (ISystemConstant.ADMIN.equals(username)) {
+ if (StringUtils.equalsIgnoreCase(ISystemConstant.ADMIN, username)) {
grantedAuthorities.add(new RoleGrantedAuthorityBO(ISystemConstant.ADMIN));
loginUser = createUserBO(userPO, grantedAuthorities);
} else {
diff --git a/login-base/src/main/java/ink/wgink/login/base/service/UserLoginService.java b/login-base/src/main/java/ink/wgink/login/base/service/user/UserLoginService.java
similarity index 99%
rename from login-base/src/main/java/ink/wgink/login/base/service/UserLoginService.java
rename to login-base/src/main/java/ink/wgink/login/base/service/user/UserLoginService.java
index 7a30f70c..eda735cd 100644
--- a/login-base/src/main/java/ink/wgink/login/base/service/UserLoginService.java
+++ b/login-base/src/main/java/ink/wgink/login/base/service/user/UserLoginService.java
@@ -1,4 +1,4 @@
-package ink.wgink.login.base.service;
+package ink.wgink.login.base.service.user;
import ink.wgink.common.enums.RoleDataRightEnum;
import ink.wgink.exceptions.SaveException;
diff --git a/login-base/src/main/resources/templates/config/update.html b/login-base/src/main/resources/templates/config/update.html
index 5e58cdf8..fcda038d 100644
--- a/login-base/src/main/resources/templates/config/update.html
+++ b/login-base/src/main/resources/templates/config/update.html
@@ -12,6 +12,7 @@